Changeset 0e7c3d9 in mainline

Timestamp:

2017-05-15T19:25:23Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7ee7e6a

Parents:

fec333b3

Message:

Remove stricmp()

Location:

uspace

Files:

• lib/c/generic/str.c (modified) (1 diff)
• lib/c/include/str.h (modified) (1 diff)
• lib/http/src/headers.c (modified) (1 diff)
• srv/fs/exfat/exfat_ops.c (modified) (1 diff)
• srv/fs/fat/fat_dentry.c (modified) (2 diffs)
• srv/fs/udf/udf_ops.c (modified) (1 diff)

uspace/lib/c/generic/str.c

@@ -1239 +1239 @@
         
         return true;
-}
-
-int stricmp(const char *a, const char *b)
-{
-        int c = 0;
-        
-        while (a[c] && b[c] && (!(tolower(a[c]) - tolower(b[c]))))
-                c++;
-        
-        return (tolower(a[c]) - tolower(b[c]));
 }
 

uspace/lib/c/include/str.h

@@ -132 +132 @@
  */
 
-extern int stricmp(const char *, const char *);
-
 extern long int strtol(const char *, char **, int);
 extern unsigned long strtoul(const char *, char **, int);

uspace/lib/http/src/headers.c

@@ -251 +251 @@
 bool http_header_name_match(const char *name_a, const char *name_b)
 {
-        return stricmp(name_a, name_b) == 0;
+        return str_casecmp(name_a, name_b) == 0;
 }
 

uspace/srv/fs/exfat/exfat_ops.c

@@ -527 +527 @@
         while (exfat_directory_read_file(&di, name, EXFAT_FILENAME_LEN, &df,
             &ds) == EOK) {
-                if (stricmp(name, component) == 0) {
+                if (str_casecmp(name, component) == 0) {
                         /* hit */
                         exfat_node_t *nodep;

uspace/srv/fs/fat/fat_dentry.c

@@ -63 +63 @@
         size_t size;
 
-        if (!(rc = stricmp(name, component)))
+        if (!(rc = str_casecmp(name, component)))
                 return rc;
         if (!str_chr(name, '.')) {
@@ -73 +73 @@
                 name[size] = '.';
                 name[size + 1] = '\0';
-                rc = stricmp(name, component);
+                rc = str_casecmp(name, component);
         }
         return rc;

uspace/srv/fs/udf/udf_ops.c

@@ -131 +131 @@
                     fid->lenght_file_id, &UDF_NODE(pfn)->instance->charset);
                 
-                if (stricmp(name, component) == 0) {
+                if (str_casecmp(name, component) == 0) {
                         int rc = udf_node_get(rfn, udf_service_get(pfn),
                             udf_long_ad_to_pos(UDF_NODE(pfn)->instance, &long_ad));