actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove MAX_FMT_TRIES. I don't know why it was there.

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-18 23:15:22 +00:00
parent d8821cebab
commit 6e3d48a3d9
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+6 -7
View File
@@ -252,7 +252,6 @@ RString ssprintf( const char *fmt, ...)
return vssprintf(fmt, va); return vssprintf(fmt, va);
} }
#define MAX_FMT_TRIES 5 // #of times we try
#define FMT_BLOCK_SIZE 2048 // # of bytes to increment per try #define FMT_BLOCK_SIZE 2048 // # of bytes to increment per try
RString vssprintf( const char *szFormat, va_list argList ) RString vssprintf( const char *szFormat, va_list argList )
@@ -271,12 +270,11 @@ RString vssprintf( const char *szFormat, va_list argList )
iChars += iTry * FMT_BLOCK_SIZE; iChars += iTry * FMT_BLOCK_SIZE;
pBuf = (char*) _alloca( sizeof(char)*iChars ); pBuf = (char*) _alloca( sizeof(char)*iChars );
iUsed = vsnprintf( pBuf, iChars-1, szFormat, argList ); iUsed = vsnprintf( pBuf, iChars-1, szFormat, argList );
} while ( iUsed < 0 && iTry++ < MAX_FMT_TRIES ); ++iTry;
} while( iUsed < 0 );
int iActual = min( iUsed, iChars-1 );
// assign whatever we managed to format // assign whatever we managed to format
sStr.assign( pBuf, iActual ); sStr.assign( pBuf, iUsed );
#else #else
static bool bExactSizeSupported; static bool bExactSizeSupported;
static bool bInitialized = false; static bool bInitialized = false;
@@ -306,7 +304,7 @@ RString vssprintf( const char *szFormat, va_list argList )
int iChars = FMT_BLOCK_SIZE; int iChars = FMT_BLOCK_SIZE;
int iTry = 1; int iTry = 1;
do while( 1 )
{ {
// Grow more than linearly (e.g. 512, 1536, 3072, etc) // Grow more than linearly (e.g. 512, 1536, 3072, etc)
char *buf = GetBuffer(iChars); char *buf = GetBuffer(iChars);
@@ -316,13 +314,14 @@ RString vssprintf( const char *szFormat, va_list argList )
{ {
iChars += ((iTry+1) * FMT_BLOCK_SIZE); iChars += ((iTry+1) * FMT_BLOCK_SIZE);
ReleaseBuffer(); ReleaseBuffer();
++iTry;
continue; continue;
} }
/* OK */ /* OK */
sStr.ReleaseBuffer(iUsed); sStr.ReleaseBuffer(iUsed);
break; break;
} while ( iTry++ < MAX_FMT_TRIES ); }
#endif #endif
return sStr; return sStr;
} }