util: drop unused strchr() wrapper

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

diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index f6ed0138c1faf94ed399ef6f90e334d61e4a2469..ab3c8eb316db7a318542c6acc25889f0816e81e0 100644 (file)
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -55,7 +55,7 @@ _debug_vprintf(const char *format, va_list ap)
    /* We buffer until we find a newline. */
    size_t len = strlen(buf);
    int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);
    /* We buffer until we find a newline. */
    size_t len = strlen(buf);
    int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);

-   if (ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {
+   if (ret > (int)(sizeof(buf) - len - 1) || strchr(buf + len, '\n')) {

       os_log_message(buf);
       buf[0] = '\0';
    }
       os_log_message(buf);
       buf[0] = '\0';
    }

diff --git a/src/util/u_string.h b/src/util/u_string.h
index 742f5079fb6215aa9a0f78fe280799026c4597c3..6e762fbdc174948e297deacde6cd554dd6e1e18d 100644 (file)
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -134,14 +134,6 @@ util_vasprintf(char **ret, const char *format, va_list ap)
    return util_vsnprintf(*ret, r + 1, format, ap);
 }
 
    return util_vsnprintf(*ret, r + 1, format, ap);
 }
 

-static inline char *
-util_strchr(const char *s, char c)
-{
-   char *p = util_strchrnul(s, c);
-
-   return *p ? p : NULL;
-}
-

 static inline char*
 util_strncat(char *dst, const char *src, size_t n)
 {
 static inline char*
 util_strncat(char *dst, const char *src, size_t n)
 {


@@ -200,7 +192,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
 #define util_vsprintf vsprintf
 #define util_vasprintf vasprintf
 #define util_sprintf sprintf
 #define util_vsprintf vsprintf
 #define util_vasprintf vasprintf
 #define util_sprintf sprintf

-#define util_strchr strchr

 #define util_strcmp strcmp
 #define util_strncmp strncmp
 #define util_strncat strncat
 #define util_strcmp strcmp
 #define util_strncmp strncmp
 #define util_strncat strncat