Merge pull request #187 from divVerent/patch-1

[xonotic/gmqcc.git] / util.cpp

diff --git a/util.cpp b/util.cpp
index 9c1ef6a117ae90ef01710ee34c3201cbe2d96427..fa18d04c9857ceba78c7cbfbd3e1ad6e09e6d24b 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -539,7 +539,7 @@ size_t util_optimizationtostr(const char *in, char *out, size_t outsz) {
 static int util_vasprintf(char **dat, const char *fmt, va_list args) {
     int     ret;
     int     len;
-    char   *tmp = NULL;
+    char   *tmp = nullptr;
     char    buf[128];
     va_list cpy;
 
@@ -558,7 +558,7 @@ static int util_vasprintf(char **dat, const char *fmt, va_list args) {
     tmp = (char*)mem_a(len + 1);
     if ((ret = vsnprintf(tmp, len + 1, fmt, args)) != len) {
         mem_d(tmp);
-        *dat = NULL;
+        *dat = nullptr;
         return -1;
     }
 
@@ -670,6 +670,7 @@ bool util_isatty(FILE *file) {
 }
 #else
 bool util_isatty(FILE *file) {
+    (void)file;
     return false;
 }
 #endif