From 3d66f2c9ae95425175d52f27ddfea36f52b5b740 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 6 Apr 2009 22:42:08 +0000 Subject: [PATCH] 2009-04-06 Mike Burgess * libc/string/strncasecmp.c: Optimized rewrite. --- newlib/ChangeLog | 4 ++++ newlib/libc/string/strncasecmp.c | 19 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 4de7d55de..13ba84fb1 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2009-04-06 Mike Burgess + + * libc/string/strncasecmp.c: Optimized rewrite. + 2009-04-06 Ken Werner * libc/include/sys/features.h: Undefine _POSIX_TIMERS for spu. diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c index c877ba53c..c2eb5b86c 100644 --- a/newlib/libc/string/strncasecmp.c +++ b/newlib/libc/string/strncasecmp.c @@ -49,16 +49,15 @@ _DEFUN (strncasecmp, (s1, s2, n), _CONST char *s2 _AND size_t n) { - if (n == 0) - return 0; - - while (n-- != 0 && tolower(*s1) == tolower(*s2)) + _CONST unsigned char *ucs1 = (_CONST unsigned char *) s1; + _CONST unsigned char *ucs2 = (_CONST unsigned char *) s2; + int d = 0; + for ( ; n != 0; n--) { - if (n == 0 || *s1 == '\0' || *s2 == '\0') - break; - s1++; - s2++; + _CONST int c1 = tolower(*ucs1++); + _CONST int c2 = tolower(*ucs2++); + if (((d = c1 - c2) != 0) || (c2 == '\0')) + break; } - - return tolower(*(unsigned char *) s1) - tolower(*(unsigned char *) s2); + return d; }