[Mesa-dev] [PATCH mesa 03/13] util: use standard name for strdup()

[Eric Engestrom]

Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
---
 src/gallium/auxiliary/util/u_debug_symbol.c | 2 +-
 src/mesa/program/symbol_table.c             | 4 ++--
 src/util/u_string.h                         | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c 
b/src/gallium/auxiliary/util/u_debug_symbol.c
index 22e6c8ce771910c95320..ad9b8f11204acb67d40b 100644
--- a/src/gallium/auxiliary/util/u_debug_symbol.c
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
@@ -309,7 +309,7 @@ debug_symbol_name_cached(const void *addr)
    {
       char buf[1024];
       debug_symbol_name(addr, buf, sizeof(buf));
-      name = util_strdup(buf);
+      name = strdup(buf);
 
       util_hash_table_set(symbols_hash, (void*)addr, (void*)name);
    }
diff --git a/src/mesa/program/symbol_table.c b/src/mesa/program/symbol_table.c
index e01faa5c6e1f98ec4f3e..0dcb1f292c91c546bac9 100644
--- a/src/mesa/program/symbol_table.c
+++ b/src/mesa/program/symbol_table.c
@@ -194,7 +194,7 @@ _mesa_symbol_table_add_symbol(struct _mesa_symbol_table 
*table,
       new_sym->next_with_same_name = sym;
       new_sym->name = sym->name;
    } else {
-      new_sym->name = util_strdup(name);
+      new_sym->name = strdup(name);
       if (new_sym->name == NULL) {
          free(new_sym);
          _mesa_error_no_memory(__func__);
@@ -266,7 +266,7 @@ _mesa_symbol_table_add_global_symbol(struct 
_mesa_symbol_table *table,
 
       sym->name = inner_sym->name;
    } else {
-      sym->name = util_strdup(name);
+      sym->name = strdup(name);
       if (sym->name == NULL) {
          free(sym);
          _mesa_error_no_memory(__func__);
diff --git a/src/util/u_string.h b/src/util/u_string.h
index 5687fa8aed1ff98287e6..d74ce1db8537bda54e48 100644
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -201,7 +201,7 @@ util_strstr(const char *haystack, const char *needle)
 
 
 #define strcasecmp stricmp
-#define util_strdup _strdup
+#define strdup _strdup
 
 #else
 
@@ -215,7 +215,6 @@ util_strstr(const char *haystack, const char *needle)
 #define util_strncmp strncmp
 #define util_strncat strncat
 #define util_strstr strstr
-#define util_strdup strdup
 
 #endif
 
-- 
Cheers,
  Eric

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev