Mesa (master): util: drop unused strstr() wrapper

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jul 19 21:48:51 UTC 2019


Module: Mesa
Branch: master
Commit: 84e85035cff0692c281dd13f18649560efee59f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84e85035cff0692c281dd13f18649560efee59f9

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Nov 20 11:43:57 2018 +0000

util: drop unused strstr() wrapper

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

---

 src/util/u_string.h | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/util/u_string.h b/src/util/u_string.h
index e4081466459..742f5079fb6 100644
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -188,19 +188,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
    return 0;
 }
 
-static inline char *
-util_strstr(const char *haystack, const char *needle)
-{
-   const char *p = haystack;
-   size_t len = strlen(needle);
-
-   for (; (p = util_strchr(p, *needle)) != 0; p++) {
-      if (util_strncmp(p, needle, len) == 0) {
-	 return (char *)p;
-      }
-   }
-   return NULL;
-}
 
 
 #define util_strcasecmp stricmp
@@ -217,7 +204,6 @@ util_strstr(const char *haystack, const char *needle)
 #define util_strcmp strcmp
 #define util_strncmp strncmp
 #define util_strncat strncat
-#define util_strstr strstr
 #define util_strcasecmp strcasecmp
 #define util_strdup strdup
 




More information about the mesa-commit mailing list