util: use standard name for strcmp()

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index 465d669b69e7aeaee2f78f4cd84d4df99ba9a9f8..adf62ae9b4a6153c2a2cd13fb02a0496fbc7ce3d 100644 (file)
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -167,19 +167,19 @@ debug_get_bool_option(const char *name, boolean dfault)
 
    if (str == NULL)
       result = dfault;
-   else if (!util_strcmp(str, "n"))
+   else if (!strcmp(str, "n"))
       result = FALSE;
-   else if (!util_strcmp(str, "no"))
+   else if (!strcmp(str, "no"))
       result = FALSE;
-   else if (!util_strcmp(str, "0"))
+   else if (!strcmp(str, "0"))
       result = FALSE;
-   else if (!util_strcmp(str, "f"))
+   else if (!strcmp(str, "f"))
       result = FALSE;
-   else if (!util_strcmp(str, "F"))
+   else if (!strcmp(str, "F"))
       result = FALSE;
-   else if (!util_strcmp(str, "false"))
+   else if (!strcmp(str, "false"))
       result = FALSE;
-   else if (!util_strcmp(str, "FALSE"))
+   else if (!strcmp(str, "FALSE"))
       result = FALSE;
    else
       result = TRUE;
@@ -227,7 +227,7 @@ str_has_option(const char *str, const char *name)
    }
 
    /* OPTION=all */
-   if (!util_strcmp(str, "all")) {
+   if (!strcmp(str, "all")) {
       return TRUE;
    }
 
@@ -276,7 +276,7 @@ debug_get_flags_option(const char *name,
    str = os_get_option(name);
    if (!str)
       result = dfault;
-   else if (!util_strcmp(str, "help")) {
+   else if (!strcmp(str, "help")) {
       result = dfault;
       _debug_printf("%s: help for %s:\n", __FUNCTION__, name);
       for (; flags->name; ++flags)

diff --git a/src/util/u_string.h b/src/util/u_string.h
index 2b7b7a502b8dfcb422b8741b28c04c6fefcb8625..fe0f857218ff22ed11e5d7298ed081d065ca4cfc 100644 (file)
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -140,6 +140,7 @@ util_strncat(char *dst, const char *src, size_t n)
    return dst;
 }
 
+#define strcmp util_strcmp
 static inline int
 util_strcmp(const char *s1, const char *s2)
 {
@@ -184,7 +185,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
 #define util_snprintf snprintf
 #define util_vasprintf vasprintf
 #define util_sprintf sprintf
-#define util_strcmp strcmp
 
 #endif