From c1b7d9d93dc8e88693162c0d984a114371919fdd Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 24 Jul 2016 20:00:34 +0200 Subject: Implement per-locale string functions strcasecmp_l, strcoll_l, strncasecmp_l, strxfrm_l, wcscasecmp_l, wcscoll_l, wcstrncasecmp_l, wcstrxfrm_l, strftime_l. Add missing CHEWOUT_FILES from previous patch. TODO: strfmon_l. Signed-off by: Corinna Vinschen --- newlib/libc/string/wcsncasecmp.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'newlib/libc/string/wcsncasecmp.c') diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c index 1634ca195..c6fc08ef6 100644 --- a/newlib/libc/string/wcsncasecmp.c +++ b/newlib/libc/string/wcsncasecmp.c @@ -49,16 +49,13 @@ _DEFUN (wcsncasecmp, (s1, s2, n), _CONST wchar_t *s2 _AND size_t n) { - if (n == 0) - return 0; - - while (n-- != 0 && towlower(*s1) == towlower(*s2)) + int d = 0; + for ( ; n != 0; n--) { - if (n == 0 || *s1 == '\0' || *s2 == '\0') - break; - s1++; - s2++; + const int c1 = towlower (*s1++); + const int c2 = towlower (*s2++); + if (((d = c1 - c2) != 0) || (c2 == '\0')) + break; } - - return towlower(*s1) - towlower(*s2); + return d; } -- cgit v1.2.3