Fixed issue #42

uefi/string.c

@@ -148,7 +148,7 @@ char_t *strcat(char_t *dst, const char_t *src)
 int strcmp(const char_t *s1, const char_t *s2)
 {
     if(s1 && s2 && s1!=s2) {
-        do{if(*s1!=*s2){return *s1-*s2;}s1++;s2++;}while(*s1!=0);
+        while(*s1 && *s1==*s2){s1++;s2++;}
         return *s1-*s2;
     }
     return 0;
@@ -169,7 +169,7 @@ int strncmp(const char_t *s1, const char_t *s2, size_t n)
 {
     const char_t *e = s1+n;
     if(s1 && s2 && s1!=s2 && n>0) {
-        do{if(*s1!=*s2){return *s1-*s2;}s1++;s2++;}while(*s1!=0 && s1<e);
+        while(s1<e && *s1 && *s1==*s2){s1++;s2++;}
         return *s1-*s2;
     }
     return 0;