Changeset 109a998 in mainline

Timestamp:

2011-04-30T05:52:19Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e686889c

Parents:

64b5d15

Message:

libcompat: Small changes to the <string.h> implementation

File:

• uspace/lib/compat/string.c (modified) (6 diffs)

uspace/lib/compat/string.c

@@ -36 +36 @@
  */
 static char *strzero(const char *s) {
-        for (; *s != '\0'; ++ s) ;;
+        while (*s != '\0')
+                s ++;
+
         return (char*) s;
 }
@@ -44 +46 @@
         assert (src != NULL);
 
-        return (char *) memcpy(dest, src, strlen(src) + 1);
+        char *dptr = dest;
+
+        while (*src != '\0') {
+                *dptr = *src;
+                src ++;
+                dptr ++;
+        }
+        
+        *dptr = '\0';
+        return dest;
 }
 
@@ -51 +62 @@
         assert (src != NULL);
 
-        size_t len = strlen(src) + 1;
-        memcpy(dest, src, (n < len ? n : len));
-        if (n > len) {
+        char *dptr = dest;
+
+        for (int i = 0; i < n; ++ i) {
                 /* the standard requires that nul characters
-                   are appended to the length of n */
-                memset(dest + len, '\0', n - len);
-        }
+                 * are appended to the length of n, in case src is shorter
+                 */
+                *dptr = *src;
+                if (*src != '\0') {
+                        src ++;
+                }
+                dptr ++;
+        }
+        
         return dest;
 }
@@ -141 +158 @@
         const unsigned char *s = mem;
         
-        for (; n != 0; -- n) {
+        for (int i = 0; i < n; ++ i) {
                 if (*s == (unsigned char) c) {
                         return (void *) s;
@@ -216 +233 @@
 /* returns true if s2 is a prefix of s1 */
 static bool begins_with(const char *s1, const char *s2) {
-        for (; *s1 == *s2 && *s2 != '\0'; ++ s1, ++ s2) ;;
+        while (*s1 == *s2 && *s2 != '\0') {
+                s1 ++;
+                s2 ++;
+        }
         return *s2 == '\0';
 }
@@ -228 +248 @@
 
         while (*s1 != '\0') {
-                s1 = strchr(s1, *s2);
-                
-                if (s1 == NULL)
-                        return NULL;
-                
                 if (begins_with(s1, s2))
                         return (char *) s1;