diff options
| author | B Stack <bgstack15@gmail.com> | 2020-06-20 18:42:30 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-06-20 18:42:30 +0000 |
| commit | a2c5f84d26cba5401bd89978de7a1e67e0f60ea8 (patch) | |
| tree | fbbe856cbc0ba5a5d3a831f3ec514563cc69ecb1 /zen/zstring.cpp | |
| parent | Merge branch '10.24' into 'master' (diff) | |
| parent | add upstream 10.25 (diff) | |
| download | FreeFileSync-a2c5f84d26cba5401bd89978de7a1e67e0f60ea8.tar.gz FreeFileSync-a2c5f84d26cba5401bd89978de7a1e67e0f60ea8.tar.bz2 FreeFileSync-a2c5f84d26cba5401bd89978de7a1e67e0f60ea8.zip | |
Merge branch '10.25' into 'master'10.25
add upstream 10.25
See merge request opensource-tracking/FreeFileSync!23
Diffstat (limited to 'zen/zstring.cpp')
| -rw-r--r-- | zen/zstring.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/zen/zstring.cpp b/zen/zstring.cpp index 8b16e02d..690f004b 100644 --- a/zen/zstring.cpp +++ b/zen/zstring.cpp @@ -64,7 +64,7 @@ Zstring getUnicodeNormalForm(const Zstring& str) return outStr; } - catch (SysError&) + catch ([[maybe_unused]] const SysError& e) { assert(false); return str; @@ -177,8 +177,7 @@ int compareNatural(const Zstring& lhs, const Zstring& rhs) const char* const strEndL = strL + lhsNorm.size(); const char* const strEndR = strR + rhsNorm.size(); - /* - - compare strings after conceptually creating blocks of whitespace/numbers/text + /* - compare strings after conceptually creating blocks of whitespace/numbers/text - implement strict weak ordering! - don't follow broken "strnatcasecmp": https://github.com/php/php-src/blob/master/ext/standard/strnatcmp.c 1. incorrect non-ASCII CI-comparison @@ -186,8 +185,7 @@ int compareNatural(const Zstring& lhs, const Zstring& rhs) 3. incorrect trimming of *all* whitespace 4. arbitrary handling of leading 0 only at string begin 5. incorrect handling of whitespace following a number - 6. code is a mess - */ + 6. code is a mess */ for (;;) { if (strL == strEndL || strR == strEndR) |