maride/tty-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src/gui.c: always use "%s"-style format for printf()-style functions

Browse Source 
`ncuses-6.3` added printf-style function attributes and now makes
it easier to catch cases when user input is used in palce of format
string when built with CFLAGS=-Werror=format-security:

    src/gui.c:48:13: error: format not a string literal and no format arguments [-Werror=format-security]
       48 |             card_suits[card->suit]);
          |             ^~~~~~~~~~

Let's wrap all the missing places with "%s" format.
This commit is contained in:
Sergei Trofimovich 2021-11-02 23:24:42 +00:00
parent 4875f34e6b
commit 4d066c564d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui.c
View File

@ -13,9 +13,9 @@ static const char *card_values[13] = {"A", "2", "3", "4", "5", "6", "7",
"8", "9", "10", "J", "Q", "K"};
static void draw_value(struct card *card) {
mvwprintw(card->frame->window, 0, 0, card_values[card->value]);
mvwprintw(card->frame->window, 0, 0, "%s", card_values[card->value]);
mvwprintw(card->frame->window, 4, 7 - strlen(card_values[card->value]),
card_values[card->value]);
"%s", card_values[card->value]);
}
static void draw_suit(struct card *card) {
@ -43,9 +43,9 @@ static void draw_suit(struct card *card) {
}
}
mvwprintw(card->frame->window, 0, strlen(card_values[card->value]),
card_suits[card->suit]);
"%s", card_suits[card->suit]);
mvwprintw(card->frame->window, 4, 6 - strlen(card_values[card->value]),
card_suits[card->suit]);
"%s", card_suits[card->suit]);
if (card->suit % 2 == 0) {
wattroff(card->frame->window, COLOR_PAIR(RED_ON_WHITE));
} else {