tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Icinga/utf8cp

Browse Source 
Utility::ValidateUTF8(): move a string instead of copying a vector
This commit is contained in:
Julian Brost 2022-10-07 10:21:37 +02:00 committed by GitHub
commit 87a4925997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

6
lib/base/utility.cpp

@ -1779,8 +1779,8 @@ const char l_Utf8Replacement[] = "\xEF\xBF\xBD";
String Utility::ValidateUTF8(const String& input)
{
std::vector<char> output;
output.reserve(input.GetLength() * 3u);
std::string output;
output.reserve(input.GetLength());
try {
utf8::replace_invalid(input.Begin(), input.End(), std::back_inserter(output));
@ -1788,7 +1788,7 @@ String Utility::ValidateUTF8(const String& input)
output.insert(output.end(), (const char*)l_Utf8Replacement, (const char*)l_Utf8Replacement + 3);
}
return String(output.begin(), output.end());
return String(std::move(output));
}
String Utility::CreateTempFile(const String& path, int mode, std::fstream& fp)