From 3ba199abd122e52734effc64426f57578d9e38a2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 20 Nov 2018 11:42:14 +0000 Subject: [PATCH] util: use standard name for strdup() Signed-off-by: Eric Engestrom Reviewed-by: Eric Anholt Reviewed-by: Emil Velikov Reviewed-by: Eric Anholt --- 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 d8380b76bf6..a3290142b33 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 e01faa5c6e1..0dcb1f292c9 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 b43c42650e1..cc97f58e02e 100644 --- a/src/util/u_string.h +++ b/src/util/u_string.h @@ -174,7 +174,7 @@ util_strncmp(const char *s1, const char *s2, size_t n) #define util_strcasecmp stricmp -#define util_strdup _strdup +#define strdup _strdup #else @@ -186,7 +186,6 @@ util_strncmp(const char *s1, const char *s2, size_t n) #define util_strncmp strncmp #define util_strncat strncat #define util_strcasecmp strcasecmp -#define util_strdup strdup #endif -- 2.30.2