fix an FTBFS with -Werror=format-security

Fixes ticket:3493.
Warzone2100 · May 20, 2012 · e5d2242 · e5d2242
1 parent 52511ce
commit e5d2242
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/netplay/netplay.cpp b/lib/netplay/netplay.cpp
@@ -2505,7 +2505,7 @@ static void NETallowJoining(void)
 
 					char buf[250] = {'\0'};
 					snprintf(buf, sizeof(buf), "Player %s has joined, IP is: %s", name, NetPlay.players[index].IPtextAddress);
-					debug(LOG_INFO, buf);
+					debug(LOG_INFO, "%s", buf);
 					NETlogEntry(buf, SYNC_FLAG, index);
 
 					debug(LOG_NET, "Player, %s, with index of %u has joined using socket %p", name, (unsigned int)index, connected_bsocket[index]);
@@ -3177,7 +3177,7 @@ struct SyncDebugIntList : public SyncDebugEntry
 		{
 			switch (numInts)
 			{
-				case  0: index += snprintf(buf + index, bufSize - index, string); break;
+				case  0: index += snprintf(buf + index, bufSize - index, "%s", string); break;
 				case  1: index += snprintf(buf + index, bufSize - index, string, ints[0]); break;
 				case  2: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1]); break;
 				case  3: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1], ints[2]); break;

diff --git a/lib/script/parse.h b/lib/script/parse.h
@@ -305,7 +305,7 @@ extern bool scriptInitParser(void);
 extern int scr_parse(void);
 
 /* Give an error message */
-void scr_error(const char *pMessage, ...) WZ_DECL_FORMAT(printf, 1, 2);
+void scr_error(const char *pMessage, ...);
 
 extern void scriptGetErrorData(int *pLine, char **ppText);
 

diff --git a/src/qtscriptfuncs.cpp b/src/qtscriptfuncs.cpp
@@ -1133,7 +1133,7 @@ static QScriptValue js_debug(QScriptContext *context, QScriptEngine *engine)
 		}
 		result.append(s);
 	}
-	qWarning(result.toAscii().constData());
+	qWarning("%s", result.toAscii().constData());
 	return QScriptValue();
 }
 

diff --git a/src/scriptvals.h b/src/scriptvals.h
@@ -56,7 +56,7 @@ struct ARRAY_INDEXES
 
 /* A simple error reporting routine */
 
-extern void scrv_error(const char* fmt, ...) WZ_DECL_FORMAT(printf, 1, 2);
+extern void scrv_error(const char* fmt, ...);
 
 // Lookup a type
 extern bool scrvLookUpType(const char *pIdent, INTERP_TYPE *pType);