summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2018-11-20 11:55:55 +0000
committerEric Engestrom <eric.engestrom@intel.com>2019-07-19 22:39:38 +0100
commit00e23cd96998deae429508efa10545be13420379 (patch)
tree2b96e92a623dd6092a762882015c992abcd8bfd6
parent59c2dd1b8c7582bdb7d9a70cacd86edd9609ccb5 (diff)
downloadmesa-00e23cd96998deae429508efa10545be13420379.tar.gz
mesa-00e23cd96998deae429508efa10545be13420379.tar.bz2
mesa-00e23cd96998deae429508efa10545be13420379.zip
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>
-rw-r--r--src/gallium/auxiliary/util/u_async_debug.c2
-rw-r--r--src/gallium/auxiliary/util/u_log.c2
-rw-r--r--src/util/u_string.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_async_debug.c b/src/gallium/auxiliary/util/u_async_debug.c
index 04faa6850e7..d7aefbfe46b 100644
--- 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 095421edd06..4e261500a03 100644
--- 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 d91293c3380..846b64feb11 100644
--- 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