PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-08 06:06:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

FatalError, PrintConsole: properly mark format argument as such

Browse source 
Thanks to that static analysis can catch nonliteral format errors.
This commit is contained in:
Sebastian Krzyszkowiak 2018-07-05 01:04:54 +02:00
parent dcf1375e6f
commit 5888cd2575
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/utils.c
View file

@ -231,15 +231,13 @@ SYMBOL_EXPORT ALLEGRO_BITMAP* LoadScaledBitmap(struct Game* game, char* filename
return target; return target;
} }
SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { __attribute__((__format__(__printf__, 3, 0))) SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) {
// TODO: interrupt and take over loading thread when it happens // TODO: interrupt and take over loading thread when it happens
char text[1024] = {0}; char text[1024] = {0};
PrintConsole(game, "Fatal Error, displaying Blue Screen of Derp..."); PrintConsole(game, "Fatal Error, displaying Blue Screen of Derp...");
va_list vl; va_list vl;
va_start(vl, format); va_start(vl, format);
SUPPRESS_WARNING("-Wformat-nonliteral")
vsnprintf(text, 1024, format, vl); vsnprintf(text, 1024, format, vl);
SUPPRESS_END
va_end(vl); va_end(vl);
fprintf(stderr, "%s\n", text); fprintf(stderr, "%s\n", text);
@ -430,13 +428,11 @@ SYMBOL_EXPORT char* GetDataFilePath(struct Game* game, const char* filename) {
ALLEGRO_DEBUG_CHANNEL("libsuperderpy") ALLEGRO_DEBUG_CHANNEL("libsuperderpy")
SYMBOL_EXPORT void PrintConsole(struct Game* game, char* format, ...) { __attribute__((__format__(__printf__, 2, 0))) SYMBOL_EXPORT void PrintConsole(struct Game* game, char* format, ...) {
va_list vl; va_list vl;
va_start(vl, format); va_start(vl, format);
char* text = game->_priv.console[game->_priv.console_pos]; char* text = game->_priv.console[game->_priv.console_pos];
SUPPRESS_WARNING("-Wformat-nonliteral")
vsnprintf(text, (sizeof(game->_priv.console[0]) / sizeof(game->_priv.console[0][0])), format, vl); vsnprintf(text, (sizeof(game->_priv.console[0]) / sizeof(game->_priv.console[0][0])), format, vl);
SUPPRESS_END
va_end(vl); va_end(vl);
SUPPRESS_WARNING("-Wused-but-marked-unused") SUPPRESS_WARNING("-Wused-but-marked-unused")