diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2009-04-07 02:42:08 +0400 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2009-04-07 02:42:08 +0400 |
commit | 3d66f2c9ae95425175d52f27ddfea36f52b5b740 (patch) | |
tree | 7d50054b878d0ceec3521381ea03f16521a84465 | |
parent | 43b1cfeca529918cb01fc07309c9bae7c1ad3630 (diff) |
2009-04-06 Mike Burgess <wizardsguild@earthlink.net>
* libc/string/strncasecmp.c: Optimized rewrite.
-rw-r--r-- | newlib/ChangeLog | 4 | ||||
-rw-r--r-- | 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 <wizardsguild@earthlink.net> + + * libc/string/strncasecmp.c: Optimized rewrite. + 2009-04-06 Ken Werner <ken.werner@de.ibm.com> * 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; } |