Changeset 607 for libcaca/trunkTweet

Timestamp:

Mar 14, 2006, 7:10:30 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Rewrote strncasecmp. Totally untested, of course.

File:

• libcaca/trunk/kernel/kernel.c (modified) (1 diff)

libcaca/trunk/kernel/kernel.c

@@ -138 +138 @@
 int strcasecmp(const char *s1, const char *s2)
 {
-    while((*s1++) && (*s2++)) {
-        char c1 = UPPER(*s1);
-        char c2 = UPPER(*s2);
-        if((*s1)>(*s2))
-            return (*s1)>(*s2);
-        if((*s1)<(*s2))
-            return (*s1)<(*s2);
-    }
-    if((*s1==0) && (*s2==0))
-        return 0;
-
-    return 1; /* FIXME */
+    while(*s1 && *s2 && UPPER(*s1) == UPPER(*s2))
+    {
+        s1++;
+        s2++;
+    }
+
+    /* Either *s1 or *s2 is 0 */
+    return (int)UPPER(*s1) - (int)UPPER(*s2);
 }