Changeset 732bb0c in mainline for uspace/lib/libc

Timestamp:

2009-04-14T19:08:10Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

4482bc7

Parents:

47a6708

Message:

Nuke strncmp().

Location:

uspace/lib/libc

Files:

• generic/getopt.c (modified) (1 diff)
• generic/string.c (modified) (1 diff)
• include/string.h (modified) (1 diff)

uspace/lib/libc/generic/getopt.c

@@ -387 +387 @@
                 for (i = 0; long_options[i].name; i++) {
                         /* find matching long option */
-                        if (strncmp(current_argv, long_options[i].name,
-                            current_argv_len))
+                        if (str_lcmp(current_argv, long_options[i].name,
+                            str_nlength(current_argv, current_argv_len)))
                                 continue;
 

uspace/lib/libc/generic/string.c

@@ -662 +662 @@
 }
 
-int strncmp(const char *a, const char *b, size_t n)
-{
-        size_t c = 0;
-
-        while (c < n && a[c] && b[c] && (!(a[c] - b[c])))
-                c++;
-        
-        return ( c < n ? a[c] - b[c] : 0);
-        
-}
-
 int stricmp(const char *a, const char *b)
 {

uspace/lib/libc/include/string.h

@@ -87 +87 @@
  */
 
-extern int strncmp(const char *, const char *, size_t);
 extern int stricmp(const char *, const char *);