Author: fireball Date: Sat Jun 21 05:00:59 2008 New Revision: 34038
URL: http://svn.reactos.org/svn/reactos?rev=34038&view=rev Log: - vsn[w]printf -> _vsn[w]printf.
Modified: trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/string/wcs.c
Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?re... ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat Jun 21 05:00:59 2008 @@ -3081,7 +3081,7 @@ * Return the number of bytes that would have been written * The code below handles both cases */ - while ((written = vsnprintf(mem, resize, format, valist)) == -1 || + while ((written = _vsnprintf(mem, resize, format, valist)) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + 1); @@ -3107,7 +3107,7 @@ wchar_t buf[2048], *mem = buf; int written, resize = sizeof(buf) / sizeof(wchar_t), retval; /* See vfprintf comments */ - while ((written = vsnwprintf(mem, resize, format, valist)) == -1 || + while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + sizeof(wchar_t));
Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?re... ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Sat Jun 21 05:00:59 2008 @@ -774,7 +774,7 @@ */ int CDECL vsprintf( char *str, const char *format, va_list valist) { - return vsnprintf(str, INT_MAX, format, valist); + return _vsnprintf(str, INT_MAX, format, valist); }
/********************************************************************* @@ -785,7 +785,7 @@ int retval; va_list valist; va_start(valist, format); - retval = vsnprintf(str, len, format, valist); + retval = _vsnprintf(str, len, format, valist); va_end(valist); return retval; } @@ -814,7 +814,7 @@ int retval; va_list valist; va_start(valist, format); - retval = vsnwprintf(str, len, format, valist); + retval = _vsnwprintf(str, len, format, valist); va_end(valist); return retval; } @@ -828,7 +828,7 @@ int r;
va_start( ap, format ); - r = vsnprintf( str, INT_MAX, format, ap ); + r = _vsnprintf( str, INT_MAX, format, ap ); va_end( ap ); return r; } @@ -842,7 +842,7 @@ int r;
va_start( ap, format ); - r = vsnwprintf( str, INT_MAX, format, ap ); + r = _vsnwprintf( str, INT_MAX, format, ap ); va_end( ap ); return r; } @@ -852,7 +852,7 @@ */ int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args ) { - return vsnwprintf( str, INT_MAX, format, args ); + return _vsnwprintf( str, INT_MAX, format, args ); } #endif /*********************************************************************