From 19e1c8bb4ef01f8dc6dc476e3481f94504b9a8f6 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 26 Dec 2008 23:23:18 +0000
Subject: [PATCH] Fix format strings.

---
 stepmania/src/GameCommand.cpp                      | 2 +-
 stepmania/src/InputMapper.cpp                      | 2 +-
 stepmania/src/OptionRowHandler.cpp                 | 2 +-
 stepmania/src/RageBitmapTexture.cpp                | 2 +-
 stepmania/src/RageDisplay_OGL.cpp                  | 2 +-
 stepmania/src/ScreenTestLights.cpp                 | 6 +++---
 stepmania/src/archutils/Unix/CrashHandlerChild.cpp | 7 +++----
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp
index be299eb47f..6e2f6e4dd6 100644
--- a/stepmania/src/GameCommand.cpp
+++ b/stepmania/src/GameCommand.cpp
@@ -387,7 +387,7 @@ void GameCommand::LoadOne( const Command& cmd )
 	else
 	{
 		RString sWarning = ssprintf( "Command '%s' is not valid.", cmd.GetOriginalCommandString().c_str() );
-		LOG->Warn( sWarning );
+		LOG->Warn( "%s", sWarning.c_str() );
 		Dialog::OK( sWarning, "INVALID_GAME_COMMAND" );
 	}
 }
diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index 77aeaf8e95..fa9a7f9ad5 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -716,7 +716,7 @@ bool InputMapper::CheckForChangedInputDevicesAndRemap( RString &sMessageOut )
 		MESSAGEMAN->Broadcast( Message_AutoJoyMappingApplied );
 	}
 
-	LOG->Info( sMessageOut );
+	LOG->Info( "%s", sMessageOut.c_str() );
 
 	g_sLastSeenInputDevices.Set( join(",",vsCurrent) );
 	PREFSMAN->SavePrefsToDisk();
diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index f1e8c12ee5..24b0eae73e 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -277,7 +277,7 @@ public:
 				if( iFallbackOption == -1 )
 				{
 					RString s = ssprintf("No options in row \"list,%s\" were selected, and no fallback row found; selected entry 0", m_Def.m_sName.c_str());
-					LOG->Warn( s );
+					LOG->Warn( "%s", s.c_str() );
 					CHECKPOINT_M( s );
 					iFallbackOption = 0;
 				}
diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp
index 8248afa5f9..9730ae5197 100644
--- a/stepmania/src/RageBitmapTexture.cpp
+++ b/stepmania/src/RageBitmapTexture.cpp
@@ -281,7 +281,7 @@ void RageBitmapTexture::Create()
 					fFrameWidth, fFrameHeight,
 					fBetterSourceWidth, fBetterSourceHeight,
 					fBetterFrameWidth, fBetterFrameHeight );
-				LOG->Warn( sWarning );
+				LOG->Warn( "%s", sWarning.c_str() );
 				Dialog::OK( sWarning, "FRAME_DIMENSIONS_WARNING" );
 			}
 		}
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 21838e933d..98a47203da 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -505,7 +505,7 @@ RString RageDisplay_OGL::Init( const VideoModeParams &p, bool bAllowUnaccelerate
 	{
 		if( !bAllowUnacceleratedRenderer )
 			return sError + "  " + OBTAIN_AN_UPDATED_VIDEO_DRIVER.GetValue() + "\n\n";
-		LOG->Warn( "Low-performance OpenGL renderer: " + sError );
+		LOG->Warn( "Low-performance OpenGL renderer: %s", sError.c_str() );
 	}
 
 #if defined(_WINDOWS)
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index c36c90cfdf..87b0b0eb35 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -70,17 +70,17 @@ void ScreenTestLights::Update( float fDeltaTime )
 	if( cl == CabinetLight_Invalid )
 		s += CABINET_LIGHT.GetValue()+": -----\n";
 	else
-		s += ssprintf( CABINET_LIGHT.GetValue()+": %d %s\n", cl, CabinetLightToString(cl).c_str() );
+		s += ssprintf( "%s: %d %s\n", CABINET_LIGHT.GetValue().c_str(), cl, CabinetLightToString(cl).c_str() );
 
 	if( !gi.IsValid() )
 	{
-		s += ssprintf( CONTROLLER_LIGHT.GetValue()+": -----\n" );
+		s += CONTROLLER_LIGHT.GetValue()+": -----\n";
 	}
 	else
 	{
 		RString sGameButton = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), gi.button );
 		PlayerNumber pn = (PlayerNumber)(gi.controller);
-		s += ssprintf( CONTROLLER_LIGHT.GetValue()+": %s %d %s\n", PlayerNumberToString(pn).c_str(), gi.button, sGameButton.c_str() );
+		s += ssprintf( "%s: %s %d %s\n", CONTROLLER_LIGHT.GetValue().c_str(), PlayerNumberToString(pn).c_str(), gi.button, sGameButton.c_str() );
 	}
 
 	m_textInputs.SetText( s );
diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index c4b6ffdf87..fdbc3dcac9 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -246,7 +246,7 @@ static void child_process()
 	
 	fprintf(CrashDump, "Checkpoints:\n");
 	for( unsigned i=0; i<Checkpoints.size(); ++i )
-		fprintf( CrashDump, Checkpoints[i] );
+		fputs( Checkpoints[i], CrashDump );
 	fprintf( CrashDump, "\n" );
 	
 	for( int i = 0; i < CrashData::MAX_BACKTRACE_THREADS; ++i )
@@ -277,8 +277,7 @@ static void child_process()
 	if( tty == NULL )
 		tty = stderr;
 	
-	fprintf( tty,
-		 "\n"
+	fputs( 	"\n"
 		 PRODUCT_ID " has crashed.  Debug information has been output to\n"
 		 "\n"
 		 "    " + sCrashInfoPath + "\n"
@@ -286,7 +285,7 @@ static void child_process()
 		 "Please report a bug at:\n"
 		 "\n"
 		 "    " REPORT_BUG_URL "\n"
-		 "\n" );
+		 "\n", tty );
 #endif
 }