Commit c9f729ea authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "win32: fix %zu fixups - dont use mingw's vsnprintf"

This reverts commit 151982aa.
parent 45b0f5c6
...@@ -124,11 +124,7 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap) ...@@ -124,11 +124,7 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_list ap) static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_list ap)
{ {
char *fmt = vlc_fix_format_string (format); char *fmt = vlc_fix_format_string (format);
/* traditionally, MSVCRT has provided vsnprintf as _vsnprintf; int ret = vsnprintf (str, size, fmt ? fmt : format, ap);
* to 'aid' portability/standards compliance, mingw provides a
* static version of vsnprintf that is buggy. Be sure to use
* MSVCRT version, at least it behaves as expected */
int ret = _vsnprintf (str, size, fmt ? fmt : format, ap);
free (fmt); free (fmt);
return ret; return ret;
} }
...@@ -139,7 +135,7 @@ static inline int vlc_printf (const char *format, ...) ...@@ -139,7 +135,7 @@ static inline int vlc_printf (const char *format, ...)
va_list ap; va_list ap;
int ret; int ret;
va_start (ap, format); va_start (ap, format);
ret = vlc_vprintf (format, ap); ret = vprintf (format, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
...@@ -150,7 +146,7 @@ static inline int vlc_fprintf (FILE *stream, const char *format, ...) ...@@ -150,7 +146,7 @@ static inline int vlc_fprintf (FILE *stream, const char *format, ...)
va_list ap; va_list ap;
int ret; int ret;
va_start (ap, format); va_start (ap, format);
ret = vlc_vfprintf (stream, format, ap); ret = vfprintf (stream, format, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
...@@ -162,7 +158,7 @@ static inline int vlc_sprintf (char *str, const char *format, ...) ...@@ -162,7 +158,7 @@ static inline int vlc_sprintf (char *str, const char *format, ...)
va_list ap; va_list ap;
int ret; int ret;
va_start (ap, format); va_start (ap, format);
ret = vlc_vsprintf (str, format, ap); ret = vsprintf (str, format, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
...@@ -174,12 +170,10 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...) ...@@ -174,12 +170,10 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...)
va_list ap; va_list ap;
int ret; int ret;
va_start (ap, format); va_start (ap, format);
ret = vlc_vsnprintf (str, size, format, ap); ret = vsnprintf (str, size, format, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
/* win32: snprintf must always be vlc_snprintf or _snprintf,
* see comment in vlc_vsnprintf */
# define snprintf vlc_snprintf # define snprintf vlc_snprintf
/* Make sure we don't use flawed vasprintf or asprintf either */ /* Make sure we don't use flawed vasprintf or asprintf either */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment