util: use standard name for vasprintf()

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/gallium/auxiliary/util/u_async_debug.c b/src/gallium/auxiliary/util/u_async_debug.c
index 04faa6850e76da5d9dcf4bbfb6a16ae10e38d679..d7aefbfe46bb4f612d1f73d87192e1a265033b81 100644 (file)
--- a/src/gallium/auxiliary/util/u_async_debug.c
+++ b/src/gallium/auxiliary/util/u_async_debug.c
@@ -40,7 +40,7 @@ u_async_debug_message(void *data, unsigned *id, enum pipe_debug_type type,
    char *text;
    int r;
 
-   r = util_vasprintf(&text, fmt, args);
+   r = vasprintf(&text, fmt, args);
    if (r < 0)
       return;
 

diff --git a/src/gallium/auxiliary/util/u_log.c b/src/gallium/auxiliary/util/u_log.c
index 095421edd064a5de13342a0e9d40414d8a03bd40..4e261500a03a0945f5f4bfcb64f485eab38fab67 100644 (file)
--- a/src/gallium/auxiliary/util/u_log.c
+++ b/src/gallium/auxiliary/util/u_log.c
@@ -130,7 +130,7 @@ u_log_printf(struct u_log_context *ctx, const char *fmt, ...)
    char *str = NULL;
 
    va_start(va, fmt);
-   int ret = util_vasprintf(&str, fmt, va);
+   int ret = vasprintf(&str, fmt, va);
    va_end(va);
 
    if (ret >= 0) {

diff --git a/src/util/u_string.h b/src/util/u_string.h
index d91293c33809855cb563317b168c5adbfcbbbd3d..846b64feb110215ae36a6389320e420d9dd43502 100644 (file)
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -105,6 +105,7 @@ util_sprintf(char *str, const char *format, ...)
    va_end(ap);
 }
 
+#define vasprintf util_vasprintf
 static inline int
 util_vasprintf(char **ret, const char *format, va_list ap)
 {
@@ -184,7 +185,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
 
 #define util_vsnprintf vsnprintf
 #define util_snprintf snprintf
-#define util_vasprintf vasprintf
 
 #endif