Changeset 732bb0c in mainline

Timestamp:

2009-04-14T19:08:10Z (15 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

Files:

• lib/libc/generic/getopt.c (modified) (1 diff)
• lib/libc/generic/string.c (modified) (1 diff)
• lib/libc/include/string.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (6 diffs)

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 *);
 

uspace/srv/vfs/vfs_ops.c

@@ -805 +805 @@
 void vfs_rename(ipc_callid_t rid, ipc_call_t *request)
 {
-        size_t len;
+        size_t olen, nlen;
         ipc_callid_t callid;
         int rc;
 
         /* Retrieve the old path. */
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!ipc_data_write_receive(&callid, &olen)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
                 return;
         }
-        char *old = malloc(len + 1);
+        char *old = malloc(olen + 1);
         if (!old) {
                 ipc_answer_0(callid, ENOMEM);
@@ -821 +821 @@
                 return;
         }
-        if ((rc = ipc_data_write_finalize(callid, old, len))) {
-                ipc_answer_0(rid, rc);
-                free(old);
-                return;
-        }
-        old[len] = '\0';
+        if ((rc = ipc_data_write_finalize(callid, old, olen))) {
+                ipc_answer_0(rid, rc);
+                free(old);
+                return;
+        }
+        old[olen] = '\0';
         
         /* Retrieve the new path. */
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!ipc_data_write_receive(&callid, &nlen)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -835 +835 @@
                 return;
         }
-        char *new = malloc(len + 1);
+        char *new = malloc(nlen + 1);
         if (!new) {
                 ipc_answer_0(callid, ENOMEM);
@@ -842 +842 @@
                 return;
         }
-        if ((rc = ipc_data_write_finalize(callid, new, len))) {
+        if ((rc = ipc_data_write_finalize(callid, new, nlen))) {
                 ipc_answer_0(rid, rc);
                 free(old);
@@ -848 +848 @@
                 return;
         }
-        new[len] = '\0';
-
-        char *oldc = canonify(old, &len);
-        char *newc = canonify(new, NULL);
+        new[nlen] = '\0';
+
+        char *oldc = canonify(old, &olen);
+        char *newc = canonify(new, &nlen);
         if (!oldc || !newc) {
                 ipc_answer_0(rid, EINVAL);
@@ -858 +858 @@
                 return;
         }
-        if (!strncmp(newc, oldc, len)) {
+        oldc[olen] = '\0';
+        newc[nlen] = '\0';
+        if (!str_lcmp(newc, oldc, str_length(oldc))) {
                 /* oldc is a prefix of newc */
                 ipc_answer_0(rid, EINVAL);