AxioDL/tinyxml2
2
0
Fork 0
mirror of https://github.com/AxioDL/tinyxml2.git synced 2025-05-14 19:31:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use _vscprintf to calc length of expanded format string.

Browse Source
This commit is contained in:
Thomas Roß 2014-03-13 23:35:16 +01:00
parent 85afe9c5c7
commit 268c683fbd
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tinyxml2.cpp
View File

@ -1855,28 +1855,16 @@ void XMLPrinter::Print( const char* format, ... )
vfprintf( _fp, format, va ); vfprintf( _fp, format, va );
} }
else { else {
// This seems brutally complex. Haven't figured out a better
// way on windows.
#ifdef _MSC_VER #ifdef _MSC_VER
int len = -1; int len = _vscprintf( format, va );
int expand = 1000;
while ( len < 0 ) {
len = vsnprintf_s( _accumulator.Mem(), _accumulator.Capacity(), _TRUNCATE, format, va );
if ( len < 0 ) {
expand *= 3/2;
_accumulator.PushArr( expand );
}
}
char* p = _buffer.PushArr( len ) - 1;
memcpy( p, _accumulator.Mem(), len+1 );
#else #else
int len = vsnprintf( 0, 0, format, va ); int len = vsnprintf( 0, 0, format, va );
#endif
// Close out and re-start the va-args // Close out and re-start the va-args
va_end( va ); va_end( va );
va_start( va, format ); va_start( va, format );
char* p = _buffer.PushArr( len ) - 1; char* p = _buffer.PushArr( len ) - 1;
vsnprintf( p, len+1, format, va ); vsnprintf( p, len+1, format, va );
#endif
} }
va_end( va ); va_end( va );
} }