diff options
| author | eadler <eadler@FreeBSD.org> | 2011-11-22 00:07:53 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2011-11-22 00:07:53 +0000 |
| commit | 7eb95f50e380e785a18aaee6734807ee6db226a6 (patch) | |
| tree | abcaedad17a9a120ce91c83c2e7ca0fda8f47c2d /lib/libc/string/strcasecmp.c | |
| parent | 3be48b6d59eed7d8eadd7974014c5cf08eb38e9a (diff) | |
| download | FreeBSD-src-7eb95f50e380e785a18aaee6734807ee6db226a6.zip FreeBSD-src-7eb95f50e380e785a18aaee6734807ee6db226a6.tar.gz | |
- add check for pointer equality prior to performing the O(n) pass
- while here change 's' to 's1' in strcoll
Submitted by: eadler@
Reviewed by: theraven@
Approved by: brooks@
MFC after: 2 weeks
Diffstat (limited to 'lib/libc/string/strcasecmp.c')
| -rw-r--r-- | lib/libc/string/strcasecmp.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c index 65e042e..dae91d3 100644 --- a/lib/libc/string/strcasecmp.c +++ b/lib/libc/string/strcasecmp.c @@ -48,6 +48,9 @@ strcasecmp_l(const char *s1, const char *s2, locale_t locale) const u_char *us1 = (const u_char *)s1, *us2 = (const u_char *)s2; + if (s1 == s2) + return (0); + FIX_LOCALE(locale); while (tolower_l(*us1, locale) == tolower_l(*us2++, locale)) @@ -65,18 +68,21 @@ int strncasecmp_l(const char *s1, const char *s2, size_t n, locale_t locale) { FIX_LOCALE(locale); - if (n != 0) { - const u_char - *us1 = (const u_char *)s1, - *us2 = (const u_char *)s2; - do { - if (tolower_l(*us1, locale) != tolower_l(*us2++, locale)) - return (tolower_l(*us1, locale) - tolower_l(*--us2, locale)); - if (*us1++ == '\0') - break; - } while (--n != 0); - } + const u_char + *us1 = (const u_char *)s1, + *us2 = (const u_char *)s2; + + if (( s1 == s2) | (n == 0)) + return (0); + + + do { + if (tolower_l(*us1, locale) != tolower_l(*us2++, locale)) + return (tolower_l(*us1, locale) - tolower_l(*--us2, locale)); + if (*us1++ == '\0') + break; + } while (--n != 0); return (0); } |
