mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Code Issues Releases Wiki Activity

Fix trim function

Browse Source
This commit is contained in:
Ted John
2017-02-19 21:33:14 +00:00
parent fb2c835d52
commit 8d3bf515ed
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/core/String.cpp
View File

@@ -396,27 +396,21 @@ namespace String
std::string Trim(const std::string &s)
{
const utf8 * firstNonWhitespace = nullptr;
codepoint_t codepoint;
const utf8 * ch = s.c_str();
const utf8 * nextCh;
const utf8 * firstNonWhitespace = nullptr;
const utf8 * lastNonWhitespace = nullptr;
while ((codepoint = GetNextCodepoint(ch, &nextCh)) != '\0')
{
bool isWhiteSpace = codepoint <= WCHAR_MAX && iswspace((wchar_t)codepoint);
if (isWhiteSpace)
{
if (firstNonWhitespace != nullptr)
{
break;
}
}
else
if (!isWhiteSpace)
{
if (firstNonWhitespace == nullptr)
{
firstNonWhitespace = ch;
}
lastNonWhitespace = ch;
}
ch = nextCh;
}
@@ -427,10 +421,14 @@ namespace String
size_t newStringSize = ch - firstNonWhitespace;
return std::string(firstNonWhitespace, newStringSize);
}
else if (lastNonWhitespace != nullptr)
{
size_t newStringSize = lastNonWhitespace - s.c_str() + 1;
return std::string(s.c_str(), newStringSize);
}
else
{
size_t newStringSize = ch - s.c_str();
return std::string(s.c_str(), newStringSize);
return std::string();
}
}
}