Skip to content

Commit f481133

Browse files
roossienbroossienb
authored
[GEN][ZH] Fix compile warnings related to the use of printf and scanf (#808)
1 parent 757e638 commit f481133

File tree

9 files changed

+123
-96
lines changed

9 files changed

+123
-96
lines changed

‎Core/Libraries/Source/WWVegas/WWLib/Except.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,17 +676,17 @@ void Dump_Exception_Info(EXCEPTION_POINTERS *e_info)
676676
/*
677677
** The stack contents cannot be read so just print up question marks.
678678
*/
679-
sprintf(scrap, "%08X: ", stackptr);
679+
sprintf(scrap, "%p: ", static_cast<void*>(stackptr));
680680
strcat(scrap, "????????\r\n");
681681
} else {
682682
/*
683683
** If this stack address is in our memory space then try to match it with a code symbol.
684684
*/
685685
if (IsBadCodePtr((FARPROC)*stackptr)) {
686-
sprintf(scrap, "%08X: %08X ", stackptr, *stackptr);
686+
sprintf(scrap, "%p: %08lX ", static_cast<void*>(stackptr), *stackptr);
687687
strcat(scrap, "DATA_PTR\r\n");
688688
} else {
689-
sprintf(scrap, "%08X: %08X", stackptr, *stackptr);
689+
sprintf(scrap, "%p: %08lX", static_cast<void*>(stackptr), *stackptr);
690690

691691
if (symbols_available) {
692692
symptr->SizeOfStruct = sizeof(symbol);

‎Core/Libraries/Source/WWVegas/WWLib/ini.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ double INIClass::Get_Double(char const * section, char const * entry, double def
15601560

15611561
INIEntry * entryptr = Find_Entry(section, entry);
15621562
if (entryptr != NULL && entryptr->Value != NULL) {
1563-
float val = defvalue;
1563+
double val = defvalue;
15641564
sscanf(entryptr->Value, "%lf", &val);
15651565
defvalue = val;
15661566
if (strchr(entryptr->Value, '%') != NULL) {

‎Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ const Vector2 DazzleINIClass::Get_Vector2(char const *section, char const *entry
303303
INIEntry * entryptr = Find_Entry(section, entry);
304304
if (entryptr && entryptr->Value != NULL) {
305305
Vector2 ret;
306-
if ( sscanf( entryptr->Value, "%f,%f", &ret[0], &ret[1], &ret[2] ) == 2 ) {
306+
if ( sscanf( entryptr->Value, "%f,%f", &ret[0], &ret[1] ) == 2 ) {
307307
return ret;
308308
}
309309
}

‎Generals/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
636636
else if((total > 100 ) || (total < 100 && !token ))
637637
{
638638
Char *whoopsMsg = new char[250];
639-
sprintf(whoopsMsg,"Please Double check to make sure your percentages add up to 100.", newColumns, i - 1);
639+
sprintf(whoopsMsg,"Please Double check to make sure your percentages add up to 100.");
640640
MessageBox(NULL, whoopsMsg,"Whoops",MB_OK | MB_ICONSTOP | MB_APPLMODAL);
641641
return 0;
642642
}

‎Generals/Code/Tools/GUIEdit/Source/LayoutScheme.cpp

Lines changed: 57 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,32 +2349,43 @@ Bool LayoutScheme::loadScheme( char *filename )
23492349

23502350
// write header
23512351
Int version;
2352-
fscanf( fp, "Window Layout Scheme: Version '%d'\n", &version );
2353-
if( version != SCHEME_VERSION )
2352+
if (fscanf( fp, "Window Layout Scheme: Version '%d'\n", &version ) == 1)
23542353
{
2354+
if( version != SCHEME_VERSION )
2355+
{
23552356

2356-
DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
2357-
MessageBox( TheEditor->getWindowHandle(),
2358-
"Old layout version, cannot open.", "Old File", MB_OK );
2359-
return FALSE;
2360-
2361-
} // end if
2357+
DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
2358+
MessageBox( TheEditor->getWindowHandle(),
2359+
"Old layout version, cannot open.", "Old File", MB_OK );
2360+
return FALSE;
23622361

2362+
} // end if
2363+
}
23632364
// default text colors
2364-
fscanf( fp, "Enabled Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2365-
m_enabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2366-
fscanf( fp, "Enabled Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2367-
m_enabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2368-
2369-
fscanf( fp, "Disabled Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2370-
m_disabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2371-
fscanf( fp, "Disabled Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2372-
m_disabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2373-
2374-
fscanf( fp, "Hilite Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2375-
m_hiliteText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2376-
fscanf( fp, "Hilite Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2377-
m_hiliteText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2365+
if (fscanf( fp, "Enabled Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2366+
{
2367+
m_enabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2368+
}
2369+
if (fscanf( fp, "Enabled Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2370+
{
2371+
m_enabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2372+
}
2373+
if (fscanf( fp, "Disabled Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2374+
{
2375+
m_disabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2376+
}
2377+
if (fscanf( fp, "Disabled Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2378+
{
2379+
m_disabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2380+
}
2381+
if (fscanf( fp, "Hilite Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2382+
{
2383+
m_hiliteText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2384+
}
2385+
if (fscanf( fp, "Hilite Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2386+
{
2387+
m_hiliteText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2388+
}
23782389

23792390
// default font
23802391
char fontBuffer[ 256 ];
@@ -2399,34 +2410,36 @@ Bool LayoutScheme::loadScheme( char *filename )
23992410
c = fgetc( fp ); // the end quite itself
24002411

24012412
// read the size and bold data elements
2402-
fscanf( fp, " Size: %d Bold: %d\n", &size, &bold );
2403-
2404-
// set the font
2405-
m_font = TheFontLibrary->getFont( AsciiString(fontBuffer), size, bold );
2413+
if(fscanf( fp, " Size: %i Bold: %i\n", &size, &bold ) == 2)
2414+
{
2415+
// set the font
2416+
m_font = TheFontLibrary->getFont( AsciiString(fontBuffer), size, bold );
2417+
}
24062418

24072419
// all the data for all the states
24082420
Int numStates, state;
24092421
char imageBuffer[ 128 ];
2410-
fscanf( fp, "Number of states: %d\n", &numStates );
2411-
for( Int i = 0; i < numStates; i++ )
2422+
if (fscanf( fp, "Number of states: %i\n", &numStates ) == 1)
24122423
{
2424+
for( Int i = 0; i < numStates; i++ )
2425+
{
24132426

2414-
// read all the data
2415-
fscanf( fp, "%d: Image: %s Color: (%d,%d,%d,%d) Border: (%d,%d,%d,%d)\n",
2416-
&state, imageBuffer, &colorR, &colorG, &colorB, &colorA,
2417-
&bColorR, &bColorG, &bColorB, &bColorA );
2418-
2419-
// sanity
2420-
assert( state == i );
2421-
2422-
// store the info
2423-
storeImageAndColor( (StateIdentifier)state,
2424-
TheMappedImageCollection->findImageByName( AsciiString( imageBuffer ) ),
2425-
GameMakeColor( colorR, colorG, colorB, colorA ),
2426-
GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
2427-
2428-
} // end for i
2429-
2427+
// read all the data
2428+
if( fscanf( fp, "%d: Image: %s Color: (%hhu,%hhu,%hhu,%hhu) Border: (%hhu,%hhu,%hhu,%hhu)\n",
2429+
&state, imageBuffer, &colorR, &colorG, &colorB, &colorA,
2430+
&bColorR, &bColorG, &bColorB, &bColorA ) == 10)
2431+
{
2432+
// sanity
2433+
assert( state == i );
2434+
2435+
// store the info
2436+
storeImageAndColor( (StateIdentifier)state,
2437+
TheMappedImageCollection->findImageByName( AsciiString( imageBuffer ) ),
2438+
GameMakeColor( colorR, colorG, colorB, colorA ),
2439+
GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
2440+
}
2441+
} // end for i
2442+
}
24302443
// close the file
24312444
fclose( fp );
24322445

‎GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ const Vector2 DazzleINIClass::Get_Vector2(char const *section, char const *entry
305305
INIEntry * entryptr = Find_Entry(section, entry);
306306
if (entryptr && entryptr->Value != NULL) {
307307
Vector2 ret;
308-
if ( sscanf( entryptr->Value, "%f,%f", &ret[0], &ret[1], &ret[2] ) == 2 ) {
308+
if ( sscanf( entryptr->Value, "%f,%f", &ret[0], &ret[1] ) == 2 ) {
309309
return ret;
310310
}
311311
}

‎GeneralsMD/Code/Tools/GUIEdit/Source/Dialog Procedures/ListboxProperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ static LRESULT CALLBACK listboxPropertiesCallback( HWND hWndDialog,
636636
else if((total > 100 ) || (total < 100 && !token ))
637637
{
638638
Char *whoopsMsg = new char[250];
639-
sprintf(whoopsMsg,"Please Double check to make sure your percentages add up to 100.", newColumns, i - 1);
639+
sprintf(whoopsMsg,"Please Double check to make sure your percentages add up to 100.");
640640
MessageBox(NULL, whoopsMsg,"Whoops",MB_OK | MB_ICONSTOP | MB_APPLMODAL);
641641
return 0;
642642
}

‎GeneralsMD/Code/Tools/GUIEdit/Source/LayoutScheme.cpp

Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,33 +2349,44 @@ Bool LayoutScheme::loadScheme( char *filename )
23492349

23502350
// write header
23512351
Int version;
2352-
fscanf( fp, "Window Layout Scheme: Version '%d'\n", &version );
2353-
if( version != SCHEME_VERSION )
2352+
if (fscanf( fp, "Window Layout Scheme: Version '%d'\n", &version ) == 1)
23542353
{
2354+
if( version != SCHEME_VERSION )
2355+
{
23552356

2356-
DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
2357-
MessageBox( TheEditor->getWindowHandle(),
2358-
"Old layout version, cannot open.", "Old File", MB_OK );
2359-
return FALSE;
2357+
DEBUG_LOG(( "loadScheme: Old layout file version '%d'\n", version ));
2358+
MessageBox( TheEditor->getWindowHandle(),
2359+
"Old layout version, cannot open.", "Old File", MB_OK );
2360+
return FALSE;
23602361

2361-
} // end if
2362+
} // end if
2363+
}
23622364

23632365
// default text colors
2364-
fscanf( fp, "Enabled Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2365-
m_enabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2366-
fscanf( fp, "Enabled Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2367-
m_enabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2368-
2369-
fscanf( fp, "Disabled Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2370-
m_disabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2371-
fscanf( fp, "Disabled Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2372-
m_disabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2373-
2374-
fscanf( fp, "Hilite Text: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2375-
m_hiliteText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2376-
fscanf( fp, "Hilite Text Border: (%d,%d,%d,%d)\n", &colorR, &colorG, &colorB, &colorA );
2377-
m_hiliteText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2378-
2366+
if (fscanf( fp, "Enabled Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2367+
{
2368+
m_enabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2369+
}
2370+
if (fscanf( fp, "Enabled Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2371+
{
2372+
m_enabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2373+
}
2374+
if (fscanf( fp, "Disabled Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2375+
{
2376+
m_disabledText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2377+
}
2378+
if (fscanf( fp, "Disabled Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2379+
{
2380+
m_disabledText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2381+
}
2382+
if (fscanf( fp, "Hilite Text: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2383+
{
2384+
m_hiliteText.color = GameMakeColor( colorR, colorG, colorB, colorA );
2385+
}
2386+
if (fscanf( fp, "Hilite Text Border: (%hhu,%hhu,%hhu,%hhu)\n", &colorR, &colorG, &colorB, &colorA ) == 4)
2387+
{
2388+
m_hiliteText.borderColor = GameMakeColor( colorR, colorG, colorB, colorA );
2389+
}
23792390
// default font
23802391
char fontBuffer[ 256 ];
23812392
Int size, bold;
@@ -2399,33 +2410,36 @@ Bool LayoutScheme::loadScheme( char *filename )
23992410
c = fgetc( fp ); // the end quite itself
24002411

24012412
// read the size and bold data elements
2402-
fscanf( fp, " Size: %d Bold: %d\n", &size, &bold );
2403-
2404-
// set the font
2405-
m_font = TheFontLibrary->getFont( AsciiString(fontBuffer), size, bold );
2413+
if(fscanf( fp, " Size: %i Bold: %i\n", &size, &bold ) == 2)
2414+
{
2415+
// set the font
2416+
m_font = TheFontLibrary->getFont( AsciiString(fontBuffer), size, bold );
2417+
}
24062418

24072419
// all the data for all the states
24082420
Int numStates, state;
24092421
char imageBuffer[ 128 ];
2410-
fscanf( fp, "Number of states: %d\n", &numStates );
2411-
for( Int i = 0; i < numStates; i++ )
2422+
if (fscanf( fp, "Number of states: %i\n", &numStates ) == 1)
24122423
{
2424+
for( Int i = 0; i < numStates; i++ )
2425+
{
24132426

2414-
// read all the data
2415-
fscanf( fp, "%d: Image: %s Color: (%d,%d,%d,%d) Border: (%d,%d,%d,%d)\n",
2416-
&state, imageBuffer, &colorR, &colorG, &colorB, &colorA,
2417-
&bColorR, &bColorG, &bColorB, &bColorA );
2418-
2419-
// sanity
2420-
assert( state == i );
2421-
2422-
// store the info
2423-
storeImageAndColor( (StateIdentifier)state,
2424-
TheMappedImageCollection->findImageByName( AsciiString( imageBuffer ) ),
2425-
GameMakeColor( colorR, colorG, colorB, colorA ),
2426-
GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
2427-
2428-
} // end for i
2427+
// read all the data
2428+
if( fscanf( fp, "%d: Image: %s Color: (%hhu,%hhu,%hhu,%hhu) Border: (%hhu,%hhu,%hhu,%hhu)\n",
2429+
&state, imageBuffer, &colorR, &colorG, &colorB, &colorA,
2430+
&bColorR, &bColorG, &bColorB, &bColorA ) == 10)
2431+
{
2432+
// sanity
2433+
assert( state == i );
2434+
2435+
// store the info
2436+
storeImageAndColor( (StateIdentifier)state,
2437+
TheMappedImageCollection->findImageByName( AsciiString( imageBuffer ) ),
2438+
GameMakeColor( colorR, colorG, colorB, colorA ),
2439+
GameMakeColor( bColorR, bColorG, bColorB, bColorA ) );
2440+
}
2441+
} // end for i
2442+
}
24292443

24302444
// close the file
24312445
fclose( fp );

‎GeneralsMD/Code/Tools/wdump/chunk_d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ void ChunkData::Add_Chunk(ChunkLoadClass & cload, ChunkItem *Parent)
23962396
existing.SetAt(data, data);
23972397

23982398
if(theApp.TextureDumpFile != 0)
2399-
fprintf(theApp.TextureDumpFile, "%s,%s\n", theApp.Filename, data);
2399+
fprintf(theApp.TextureDumpFile, "%s,%s\n", (LPCTSTR)theApp.Filename, data);
24002400
TRACE("%s,%s\n", theApp.Filename, data);
24012401
}
24022402
}

0 commit comments

Comments
 (0)