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

Revert "win32: make vlc_vsnprintf more like c99 vsnprintf"

This reverts commit 30f33e7a.
parent db01e438
...@@ -123,7 +123,6 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap) ...@@ -123,7 +123,6 @@ static inline int vlc_vsprintf (char *str, const char *format, va_list ap)
} }
# define vsprintf vlc_vsprintf # define vsprintf vlc_vsprintf
static inline int vasprintf (char **strp, const char *fmt, 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)
{ {
int must_free = vlc_fix_format_string (&format); int must_free = vlc_fix_format_string (&format);
...@@ -131,18 +130,7 @@ static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_ ...@@ -131,18 +130,7 @@ static inline int vlc_vsnprintf (char *str, size_t size, const char *format, va_
* to 'aid' portability/standards compliance, mingw provides a * to 'aid' portability/standards compliance, mingw provides a
* static version of vsnprintf that is buggy. Be sure to use * static version of vsnprintf that is buggy. Be sure to use
* MSVCRT version, at least it behaves as expected */ * MSVCRT version, at least it behaves as expected */
/* MSVCRT _vsnprintf does not: int ret = _vsnprintf (str, size, format, ap);
* - null terminate string if insufficient storage
* - return the number of characters that would've been written
*/
int ret = _vsnprintf (str, size-1, format, ap);
str[size-1] = 0; /* ensure the null gets written */
if (ret == -1)
{
/* work out the number of chars that should've been written */
ret = vasprintf (&str, format, ap);
if (ret >= 0 && str) free (str);
}
if (must_free) free ((char *)format); if (must_free) free ((char *)format);
return ret; return ret;
} }
...@@ -207,7 +195,7 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...) ...@@ -207,7 +195,7 @@ static inline int vlc_snprintf (char *str, size_t size, const char *format, ...)
# include <stdarg.h> # include <stdarg.h>
static inline int vasprintf (char **strp, const char *fmt, va_list ap) static inline int vasprintf (char **strp, const char *fmt, va_list ap)
{ {
#ifndef WIN32 #ifndef UNDER_CE
int len = vsnprintf (NULL, 0, fmt, ap) + 1; int len = vsnprintf (NULL, 0, fmt, ap) + 1;
char *res = (char *)malloc (len); char *res = (char *)malloc (len);
if (res == NULL) if (res == NULL)
...@@ -215,31 +203,27 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap) ...@@ -215,31 +203,27 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
*strp = res; *strp = res;
return vsnprintf (res, len, fmt, ap); return vsnprintf (res, len, fmt, ap);
#else #else
/* HACK: vsnprintf in the Win32 API behaves like /* HACK: vsnprintf in the WinCE API behaves like
* the one in glibc 2.0 and doesn't return the number of characters * the one in glibc 2.0 and doesn't return the number of characters
* it needed to copy the string. * it needed to copy the string.
* cf http://msdn.microsoft.com/en-us/library/1kt27hek.aspx * cf http://msdn.microsoft.com/en-us/library/1kt27hek.aspx
* and cf the man page of vsnprintf * and cf the man page of vsnprintf
*/ *
int must_free = vlc_fix_format_string (&fmt); Guess we need no more than 50 bytes. */
int n, size = 2 * strlen (fmt); int n, size = 50;
char *res, *np; char *res, *np;
if ((res = (char *) malloc (size)) == NULL) if ((res = (char *) malloc (size)) == NULL)
{
if (must_free) free ((char *)fmt);
return -1; return -1;
}
while (1) while (1)
{ {
n = _vsnprintf (res, size, fmt, ap); n = vsnprintf (res, size, fmt, ap);
/* If that worked, return the string. */ /* If that worked, return the string. */
if (n > -1 && n < size) if (n > -1 && n < size)
{ {
*strp = res; *strp = res;
if (must_free) free ((char *)fmt);
return n; return n;
} }
...@@ -249,7 +233,6 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap) ...@@ -249,7 +233,6 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
if ((np = (char *) realloc (res, size)) == NULL) if ((np = (char *) realloc (res, size)) == NULL)
{ {
free(res); free(res);
if (must_free) free ((char *)fmt);
return -1; return -1;
} }
else else
...@@ -258,7 +241,7 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap) ...@@ -258,7 +241,7 @@ static inline int vasprintf (char **strp, const char *fmt, va_list ap)
} }
} }
#endif /* WIN32 */ #endif /* UNDER_CE */
} }
#endif #endif
......
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