Fixing / simplifying strcmp.

Author: nicolasnoble

libc/include/string.h

@@ -154,34 +154,17 @@ static __inline__ char * strncat(char * s1, const char * s2, size_t n) {
 
 static __inline__ int strcmp(const char * s1, const char * s2) {
     char c1, c2;
-    while ((c1 = *s1++) && (c2 = *s2++)) {
-        if (!c1) {
-            return -1;
-        } else if (!c2) {
-            return 1;
-        } else if (c1 < c2) {
-            return -1;
-        } else if (c1 > c2) {
-            return 1;
-        }
+    while ((c1 = *s1++)) {
+        if ((c2 = *s2++) != c1) break;
     }
-    
-    return 0;
+    return c1 - c2;
 }
 
 static __inline__ int strncmp(const char * s1, const char * s2, size_t n) {
     char c1, c2;
-    while ((c1 = *s1++) && (c2 = *s2++) && n--) {
-        if (!c1) {
-            return -1;
-        } else if (!c2) {
-            return 1;
-        } else if (c1 < c2) {
-            return -1;
-        } else if (c1 > c2) {
-            return 1;
-        }
-    }
+    while (n--)
+        if ((c1 = *s1++) != (c2 = *s2++))
+            return c1 - c2;
 
     return 0;
 }