Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-23 01:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- vsn[w]printf -> _vsn[w]printf.

Browse source 
svn path=/trunk/; revision=34038
This commit is contained in:
Aleksey Bragin 2008-06-21 10:00:59 +00:00
parent a04bcca3a3
commit cdd5ae5641
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/sdk/crt/stdio/file.c
View file

@ -3081,7 +3081,7 @@ int CDECL vfprintf(FILE* file, const char *format, va_list valist)
* Return the number of bytes that would have been written * Return the number of bytes that would have been written
* The code below handles both cases * The code below handles both cases
*/ */
while ((written = vsnprintf(mem, resize, format, valist)) == -1 || while ((written = _vsnprintf(mem, resize, format, valist)) == -1 ||
written > resize) written > resize)
{ {
resize = (written == -1 ? resize * 2 : written + 1); resize = (written == -1 ? resize * 2 : written + 1);
@ -3107,7 +3107,7 @@ int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist)
wchar_t buf[2048], *mem = buf; wchar_t buf[2048], *mem = buf;
int written, resize = sizeof(buf) / sizeof(wchar_t), retval; int written, resize = sizeof(buf) / sizeof(wchar_t), retval;
/* See vfprintf comments */ /* See vfprintf comments */
while ((written = vsnwprintf(mem, resize, format, valist)) == -1 || while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 ||
written > resize) written > resize)
{ {
resize = (written == -1 ? resize * 2 : written + sizeof(wchar_t)); resize = (written == -1 ? resize * 2 : written + sizeof(wchar_t));

12
reactos/lib/sdk/crt/string/wcs.c
View file

@ -774,7 +774,7 @@ int CDECL _vsnprintf( char *str, unsigned int len,
*/ */
int CDECL vsprintf( char *str, const char *format, va_list valist) 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 CDECL _snprintf(char *str, unsigned int len, const char *format, ...)
int retval; int retval;
va_list valist; va_list valist;
va_start(valist, format); va_start(valist, format);
retval = vsnprintf(str, len, format, valist); retval = _vsnprintf(str, len, format, valist);
va_end(valist); va_end(valist);
return retval; return retval;
} }
@ -814,7 +814,7 @@ int CDECL _snwprintf( wchar_t *str, unsigned int len, const wchar_t *format, ...
int retval; int retval;
va_list valist; va_list valist;
va_start(valist, format); va_start(valist, format);
retval = vsnwprintf(str, len, format, valist); retval = _vsnwprintf(str, len, format, valist);
va_end(valist); va_end(valist);
return retval; return retval;
} }
@ -828,7 +828,7 @@ int CDECL sprintf( char *str, const char *format, ... )
int r; int r;
va_start( ap, format ); va_start( ap, format );
r = vsnprintf( str, INT_MAX, format, ap ); r = _vsnprintf( str, INT_MAX, format, ap );
va_end( ap ); va_end( ap );
return r; return r;
} }
@ -842,7 +842,7 @@ int CDECL swprintf( wchar_t *str, const wchar_t *format, ... )
int r; int r;
va_start( ap, format ); va_start( ap, format );
r = vsnwprintf( str, INT_MAX, format, ap ); r = _vsnwprintf( str, INT_MAX, format, ap );
va_end( ap ); va_end( ap );
return r; return r;
} }
@ -852,7 +852,7 @@ int CDECL swprintf( wchar_t *str, const wchar_t *format, ... )
*/ */
int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args ) 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 #endif
/********************************************************************* /*********************************************************************