Changeset c065743 in mainline

Timestamp:

2011-08-24T21:16:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a5454cf

Parents:

ace588a

Message:

Remove str_reverse() and size_t_str().

Location:

uspace

Files:

• lib/c/generic/str.c (modified) (1 diff)
• lib/c/include/str.h (modified) (1 diff)
• srv/fs/fat/fat_directory.c (modified) (2 diffs)

uspace/lib/c/generic/str.c

@@ -1160 +1160 @@
         str_ncpy(dest, size + 1, src, size);
         return dest;
-}
-
-void str_reverse(char* begin, char* end) 
-{
-    char aux;
-    while(end>begin)
-        aux=*end, *end--=*begin, *begin++=aux;
-}
-
-int size_t_str(size_t value, int base, char* str, size_t size) 
-{
-    static char num[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-    char* wstr=str;
-        
-        if (size == 0) 
-                return EINVAL;
-    if (base<2 || base>35) {
-        *str='\0';
-        return EINVAL;
-    }
-
-    do {
-        *wstr++ = num[value % base];
-                if (--size == 0)
-                        return EOVERFLOW;
-    } while(value /= base);
-    *wstr='\0';
-
-    // Reverse string
-    str_reverse(str,wstr-1);
-        return EOK;
 }
 

uspace/lib/c/include/str.h

@@ -99 +99 @@
 extern char *str_ndup(const char *, size_t max_size);
 
-extern void str_reverse(char* begin, char* end);
-extern int size_t_str(size_t value, int base, char* str, size_t size);
-
 extern int str_uint64(const char *, char **, unsigned int, bool, uint64_t *);
 extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);

uspace/srv/fs/fat/fat_directory.c

@@ -44 +44 @@
 #include <str.h>
 #include <align.h>
+#include <stdio.h>
 
 int fat_directory_block_load(fat_directory_t *);
@@ -347 +348 @@
         str_to_ascii(name, lname, name_len, FAT_SFN_CHAR);
 
-        size_t idx;
+        unsigned idx;
         for (idx=1; idx <= FAT_MAX_SFN; idx++) {
-                if (size_t_str(idx, 10, number, FAT_NAME_LEN-2)!=EOK)
-                        return EOVERFLOW;
+                snprintf(number, sizeof(number), "%u", idx);
 
                 /* Fill de->name with FAT_PAD */