diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2020-05-15 00:15:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 00:15:35 +0200 |
| commit | 13144a08e496b89b34093ffd3d810d3442df3c44 (patch) | |
| tree | 406d79e17b69560564fdb0972a3c50542a3a96c6 /src/StringUtils.cpp | |
| parent | Generate "LuaState_Typedefs.inc" before running clang-tidy (diff) | |
| download | cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.gz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.bz2 cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.lz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.xz cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.tar.zst cuberite-13144a08e496b89b34093ffd3d810d3442df3c44.zip | |
Diffstat (limited to 'src/StringUtils.cpp')
| -rw-r--r-- | src/StringUtils.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp index 43bf8750b..f1f0314f1 100644 --- a/src/StringUtils.cpp +++ b/src/StringUtils.cpp @@ -527,11 +527,7 @@ static bool isLegalUTF8(const unsigned char * source, int length) } case 1: if ((*source >= 0x80) && (*source < 0xc2)) return false; } - if (*source > 0xf4) - { - return false; - } - return true; + return (*source <= 0xf4); } @@ -1052,7 +1048,7 @@ AStringVector MergeStringVectors(const AStringVector & a_Strings1, const AString AStringVector res = a_Strings1; // Add each item from strings2 that is not already present: - for (auto item : a_Strings2) + for (const auto & item : a_Strings2) { if (std::find(res.begin(), res.end(), item) == res.end()) { @@ -1094,11 +1090,7 @@ bool StringToFloat(const AString & a_String, float & a_Num) { char *err; a_Num = strtof(a_String.c_str(), &err); - if (*err != 0) - { - return false; - } - return true; + return (*err == 0); } |