From: Yann Dirson Date: Tue, 27 Sep 2011 20:31:11 +0000 (+0200) Subject: Deal with warnings raised by -Wformat-security. X-Git-Url: http://winboard.nl/cgi-bin?p=gnushogi.git;a=commitdiff_plain;h=1ea53ec86415316844abc71728f155bcb194bf7f Deal with warnings raised by -Wformat-security. --- diff --git a/gnushogi/book.c b/gnushogi/book.c index cadefa3..d5fa7ac 100644 --- a/gnushogi/book.c +++ b/gnushogi/book.c @@ -290,8 +290,7 @@ BVerifyMove(char *s, unsigned short *mv, int moveno) /* Illegal move in check */ #if !defined QUIETBOOKGEN /* 077: "Illegal move (in check) %s" */ - printf(CP[77]); - printf("\n"); + puts(CP[77]); bkdisplay(s, cnt, moveno); #endif return false; diff --git a/gnushogi/commondsp.c b/gnushogi/commondsp.c index 0b677b1..50dc032 100644 --- a/gnushogi/commondsp.c +++ b/gnushogi/commondsp.c @@ -707,12 +707,12 @@ SaveGame(void) fprintf(fd, CP[37], w, b, Game50, flag.force ? "force" : ""); - fprintf(fd, empty); + fputs(empty, fd); fprintf(fd, CP[111], TCflag, OperatorTime); fprintf(fd, CP[117], TimeControl.clock[black], TimeControl.moves[black], TimeControl.clock[white], TimeControl.moves[white]); - fprintf(fd, empty); + fputs(empty, fd); for (i = NO_ROWS - 1; i > -1; i--) { @@ -750,9 +750,9 @@ SaveGame(void) fprintf(fd, "\n"); } - fprintf(fd, empty); + fputs(empty, fd); fprintf(fd, " 9 8 7 6 5 4 3 2 1\n"); - fprintf(fd, empty); + fputs(empty, fd); fprintf(fd, " p l n s g b r k\n"); for (side = 0; side <= 1; side++) @@ -769,8 +769,8 @@ SaveGame(void) fprintf(fd, "\n"); } - fprintf(fd, empty); - fprintf(fd, CP[126]); + fputs(empty, fd); + fputs(CP[126], fd); for (i = 1; i <= GameCnt; i++) { @@ -1200,8 +1200,8 @@ ListGame(void) /* fprintf(fd, "gnushogi game %d\n", u); */ fprintf(fd, CP[161], version, patchlevel); - fprintf(fd, CP[10]); - fprintf(fd, CP[11]); + fputs(CP[10], fd); + fputs(CP[11], fd); for (i = 1; i <= GameCnt; i++) { diff --git a/gnushogi/main.c b/gnushogi/main.c index 332a303..3c80977 100644 --- a/gnushogi/main.c +++ b/gnushogi/main.c @@ -208,7 +208,7 @@ main (int argc, char **argv) long j; struct fileentry n; - printf(CP[66]); + fputs(CP[66], stdout); n.f = n.t = 0; n.flags = 0; n.depth = 0; @@ -242,7 +242,7 @@ main (int argc, char **argv) int nr[MAXDEPTH]; struct fileentry n; - printf(CP[49]); + fputs(CP[49], stdout); for (i = 0; i < MAXDEPTH; i++) nr[i] = 0; @@ -305,7 +305,7 @@ main (int argc, char **argv) default: - fprintf(stderr, CP[113]); + fputs(CP[113], stderr); exit(1); } diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c index 8d195ce..0aeeb35 100644 --- a/gnushogi/rawdsp.c +++ b/gnushogi/rawdsp.c @@ -63,7 +63,7 @@ PromptForMove(void) if (!barebones && !XSHOGI) { /* printf("\nYour move is? "); */ - printf(CP[124]); + fputs(CP[124], stdout); } } @@ -243,7 +243,7 @@ Raw_help(void) "------------------------------\n"); /* printf("7g7f move from 7g to 7f quit * Exit Shogi\n"); */ - printf(CP[158]); + fputs(CP[158], stdout); /* printf("S6h move silver to 6h beep * turn %s\n", (flag.beep) ? "off" : "on"); */ printf(CP[86], (flag.beep) ? CP[92] : CP[93]); @@ -257,36 +257,36 @@ Raw_help(void) printf(CP[174], (flag.hash) ? CP[92] : CP[93]); /* printf("bd redraw board reverse * board display\n"); */ - printf(CP[130]); + fputs(CP[130], stdout); /* printf("list game to shogi.lst book * turn %s used %d of %d\n", (Book) ? "off" : "on", bookcount); */ printf(CP[170], (Book) ? CP[92] : CP[93], bookcount, booksize); /* printf("undo undo last ply remove * take back a move\n"); */ - printf(CP[200]); + fputs(CP[200], stdout); /* printf("edit edit board force * enter game moves\n"); */ - printf(CP[153]); + fputs(CP[153], stdout); /* printf("switch sides with computer both * computer match\n"); */ - printf(CP[194]); + fputs(CP[194], stdout); /* printf("black computer plays black white * computer plays white\n"); */ - printf(CP[202]); + fputs(CP[202], stdout); /* printf("depth set search depth clock * set time control\n"); */ - printf(CP[149]); + fputs(CP[149], stdout); /* printf("post principle variation hint * suggest a move\n"); */ - printf(CP[177]); + fputs(CP[177], stdout); /* printf("save game to file get * game from file\n"); */ - printf(CP[188]); + fputs(CP[188], stdout); printf("xsave pos. to xshogi file xget" " pos. from xshogi file\n"); /* printf("random randomize play new * start new game\n"); */ - printf(CP[181]); + fputs(CP[181], stdout); printf("--------------------------------" "--------------------------------\n"); /* printf("Computer: %-12s Opponent: %s\n", */ @@ -332,13 +332,13 @@ Raw_EditBoard(void) Raw_ClearScreen(); Raw_UpdateDisplay(0, 0, 1, 0); /* printf(". exit to main\n"); */ - printf(CP[29]); + fputs(CP[29], stdout); /* printf("# clear board\n"); */ - printf(CP[28]); + fputs(CP[28], stdout); /* printf("c change sides\n"); */ - printf(CP[136]); + fputs(CP[136], stdout); /* printf("enter piece & location: \n"); */ - printf(CP[155]); + fputs(CP[155], stdout); a = black; @@ -476,7 +476,7 @@ SetupBoard(void) Raw_ClearScreen(); Raw_UpdateDisplay(0, 0, 1, 0); /* printf("Setup successful\n"); */ - printf(CP[106]); + fputs(CP[106], stdout); } @@ -568,7 +568,7 @@ Raw_OutputMove(void) if (root->flags & draw) { /* printf("Drawn game!\n"); */ - printf(CP[57]); + fputs(CP[57], stdout); } else if (root->score == -(SCORE_LIMIT + 999)) { @@ -685,7 +685,7 @@ Raw_GiveHint(void) printf(CP[72], mvstr[0]); /*hint*/ } else - printf(CP[223]); + fputs(CP[223], stdout); } @@ -712,7 +712,7 @@ Raw_SelectLevel(char *sx) /* line empty ask for input */ if (!T[0]) { - printf(CP[61]); + fputs(CP[61], stdout); fgets(T, NO_SQUARES + 1, stdin); strcat(T, "XX"); } @@ -743,7 +743,7 @@ Raw_SelectLevel(char *sx) TCseconds = 0; #ifdef OPERATORTIME - printf(CP[94]); + fputs(CP[94], stdout); scanf("%hd", &OperatorTime); #endif