Changeset 92fd52d7 in mainline for uspace/lib/libc

Timestamp:

2009-04-09T21:16:50Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7afb4a5

Parents:

a2c58f6

Message:

Nuke strcpy() and strcmp().

Location:

uspace/lib/libc

Files:

• generic/console.c (modified) (1 diff)
• generic/getopt.c (modified) (2 diffs)
• generic/string.c (modified) (2 diffs)
• include/stdio.h (modified) (1 diff)
• include/string.h (modified) (3 diffs)

uspace/lib/libc/generic/console.c

@@ -220 +220 @@
         ssize_t rc;
 
-        len = strlen(s);
+        len = str_size(s);
         while (len > 0) {
                 rc = console_write(s, len);

uspace/lib/libc/generic/getopt.c

@@ -383 +383 @@
                         has_equal++;
                 } else
-                        current_argv_len = strlen(current_argv);
+                        current_argv_len = str_size(current_argv);
             
                 for (i = 0; long_options[i].name; i++) {
@@ -391 +391 @@
                                 continue;
 
-                        if (strlen(long_options[i].name) ==
+                        if (str_size(long_options[i].name) ==
                             (unsigned)current_argv_len) {
                                 /* exact match */

uspace/lib/libc/generic/string.c

@@ -607 +607 @@
 }
 
-/** Count the number of characters in the string, not including terminating 0.
- *
- * @param str           String.
- * @return              Number of characters in string.
- */
-size_t strlen(const char *str) 
-{
-        size_t counter = 0;
-
-        while (str[counter] != 0)
-                counter++;
-
-        return counter;
-}
-
-int strcmp(const char *a, const char *b)
-{
-        int c = 0;
-        
-        while (a[c] && b[c] && (!(a[c] - b[c])))
-                c++;
-        
-        return (a[c] - b[c]);
-}
-
 int strncmp(const char *a, const char *b, size_t n)
 {
@@ -871 +846 @@
 char * strdup(const char *s1)
 {
-        size_t len = strlen(s1) + 1;
+        size_t len = str_size(s1) + 1;
         void *ret = malloc(len);
 

uspace/lib/libc/include/stdio.h

@@ -50 +50 @@
         n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
         if (n > 0) \
-                (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, strlen(buf)); \
+                (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, str_size(buf)); \
 }
 

uspace/lib/libc/include/string.h

@@ -46 +46 @@
 #define STR_NO_LIMIT  ((size_t) -1)
 
-/**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  (cnt << 2)
+/**< Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -82 +82 @@
  */
 
-extern int strcmp(const char *, const char *);
 extern int strncmp(const char *, const char *, size_t);
 extern int stricmp(const char *, const char *);
@@ -90 +89 @@
 
 extern char *strcat(char *, const char *);
-
-extern size_t strlen(const char *);
 
 extern char *strdup(const char *);