diff options
Diffstat (limited to 'lib/unistr/u16-strcmp.c')
| -rw-r--r-- | lib/unistr/u16-strcmp.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/lib/unistr/u16-strcmp.c b/lib/unistr/u16-strcmp.c index 8dd332d7..96c2c1cc 100644 --- a/lib/unistr/u16-strcmp.c +++ b/lib/unistr/u16-strcmp.c @@ -1,5 +1,5 @@ /* Compare UTF-16 strings. - Copyright (C) 1999, 2002, 2006, 2009-2025 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2026 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software. @@ -38,21 +38,22 @@ u16_strcmp (const uint16_t *s1, const uint16_t *s2) { uint16_t c1 = *s1++; uint16_t c2 = *s2++; - if (c1 != 0 && c1 == c2) - continue; - if (c1 < 0xd800 || c1 >= 0xe000) + if (c1 == 0 || c1 != c2) { - if (!(c2 < 0xd800 || c2 >= 0xe000)) - /* c2 is a surrogate, but c1 is not. */ - return -1; + if (c1 < 0xd800 || c1 >= 0xe000) + { + if (!(c2 < 0xd800 || c2 >= 0xe000)) + /* c2 is a surrogate, but c1 is not. */ + return -1; + } + else + { + if (c2 < 0xd800 || c2 >= 0xe000) + /* c1 is a surrogate, but c2 is not. */ + return 1; + } + return (int)c1 - (int)c2; + /* > 0 if c1 > c2, < 0 if c1 < c2. */ } - else - { - if (c2 < 0xd800 || c2 >= 0xe000) - /* c1 is a surrogate, but c2 is not. */ - return 1; - } - return (int)c1 - (int)c2; - /* > 0 if c1 > c2, < 0 if c1 < c2. */ } } |