Require C99 conformant vsnprintf().

MinGW-w64 provides one when building with -std=gnu99.

inc/shared/platform.h

@@ -30,11 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <unistd.h>
 #endif
 
-#ifdef _WIN32
-#define PRIz    "Iu"
-#else
 #define PRIz    "zu"
-#endif
 
 #ifdef _WIN32
 #define LIBSUFFIX   ".dll"
@@ -103,7 +99,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifdef __GNUC__
 
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+#define q_printf(f, a)      __attribute__((format(gnu_printf, f, a)))
+#else
 #define q_printf(f, a)      __attribute__((format(printf, f, a)))
+#endif
 #define q_noreturn          __attribute__((noreturn))
 #define q_noinline          __attribute__((noinline))
 #define q_malloc            __attribute__((malloc))

src/common/net/win.h

@@ -341,7 +341,7 @@ static ioentry_t *os_add_io(qsocket_t fd)
 
     if (i == io_numfds) {
         if (++io_numfds > FD_SETSIZE)
-            Com_Error(ERR_FATAL, "%s: no more space for fd: %Id", __func__, fd);
+            Com_Error(ERR_FATAL, "%s: no more space for fd: %" PRIdPTR, __func__, fd);
     }
 
     e->fd = fd;
@@ -360,7 +360,7 @@ static ioentry_t *os_get_io(qsocket_t fd)
             return e;
     }
 
-    Com_Error(ERR_FATAL, "%s: fd not found: %Id", __func__, fd);
+    Com_Error(ERR_FATAL, "%s: fd not found: %" PRIdPTR, __func__, fd);
     return NULL;
 }
 

src/common/tests.c

@@ -442,16 +442,10 @@ typedef struct {
     const char *res;
 } snprintf_test_t;
 
-#ifdef _WIN32
-#define OV  SIZE_MAX
-#else
-#define OV  11
-#endif
-
 static const snprintf_test_t snprintf_tests[] = {
     { 12, 11, 11, 0, 0, "hello world"     },
-    { 11, OV, 10, 1, 0, "hello worl"      },
-    { 10, OV,  9, 1, 0, "hello wor"       },
+    { 11, 11, 10, 1, 0, "hello worl"      },
+    { 10, 11,  9, 1, 0, "hello wor"       },
     { 0,  11,  0, 1, 1, "xxxxxxxxxxxxxxx" },
 };
 

src/shared/shared.c

@@ -736,10 +736,6 @@ Q_vsnprintf
 Returns number of characters that would be written into the buffer,
 excluding trailing '\0'. If the returned value is equal to or greater than
 buffer size, resulting string is truncated.
-
-WARNING: On Win32, until MinGW-w64 vsnprintf() bug is fixed, this may return
-SIZE_MAX on overflow. Only use return value to test for overflow, don't use
-it to allocate memory.
 ===============
 */
 size_t Q_vsnprintf(char *dest, size_t size, const char *fmt, va_list argptr)
@@ -749,17 +745,9 @@ size_t Q_vsnprintf(char *dest, size_t size, const char *fmt, va_list argptr)
     if (size > INT_MAX)
         Com_Error(ERR_FATAL, "%s: bad buffer size", __func__);
 
-#ifdef _WIN32
-    if (size) {
-        ret = _vsnprintf(dest, size - 1, fmt, argptr);
-        if (ret < 0 || ret >= size - 1)
-            dest[size - 1] = 0;
-    } else {
-        ret = _vscprintf(fmt, argptr);
-    }
-#else
     ret = vsnprintf(dest, size, fmt, argptr);
-#endif
+    if (ret < 0)
+        Com_Error(ERR_FATAL, "%s: bad return value", __func__);
 
     return ret;
 }
@@ -790,10 +778,6 @@ Q_snprintf
 Returns number of characters that would be written into the buffer,
 excluding trailing '\0'. If the returned value is equal to or greater than
 buffer size, resulting string is truncated.
-
-WARNING: On Win32, until MinGW-w64 vsnprintf() bug is fixed, this may return
-SIZE_MAX on overflow. Only use return value to test for overflow, don't use
-it to allocate memory.
 ===============
 */
 size_t Q_snprintf(char *dest, size_t size, const char *fmt, ...)