panfrost/midgard: Cleanup tag fetch in disassembler

[mesa.git] / src / util / u_string.h

diff --git a/src/util/u_string.h b/src/util/u_string.h
index fa0241e5423c088413be524781a4cdfd84620118..e4081466459cb5f7902bf7f60c4e76a36279d368 100644 (file)
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -81,6 +81,7 @@ util_vsnprintf(char *str, size_t size, const char *format, va_list ap)
    if (ret < 0) {
       ret = _vscprintf(format, ap_copy);
    }
+   va_end(ap_copy);
    return ret;
 }
 
@@ -119,14 +120,14 @@ util_vasprintf(char **ret, const char *format, va_list ap)
 
    /* Compute length of output string first */
    va_copy(ap_copy, ap);
-   int r = util_vsnprintf(NULL, 0, format, ap);
+   int r = util_vsnprintf(NULL, 0, format, ap_copy);
    va_end(ap_copy);
 
    if (r < 0)
       return -1;
 
    *ret = (char *) malloc(r + 1);
-   if (!ret)
+   if (!*ret)
       return -1;
 
    /* Print to buffer */
@@ -203,6 +204,7 @@ util_strstr(const char *haystack, const char *needle)
 
 
 #define util_strcasecmp stricmp
+#define util_strdup _strdup
 
 #else
 
@@ -217,6 +219,7 @@ util_strstr(const char *haystack, const char *needle)
 #define util_strncat strncat
 #define util_strstr strstr
 #define util_strcasecmp strcasecmp
+#define util_strdup strdup
 
 #endif