Module Name: src
Committed By: christos
Date: Tue Aug 16 11:14:05 UTC 2011
Modified Files:
src/games/mille: extern.c mille.h print.c
Log Message:
eliminate non-literal format strings
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/games/mille/extern.c
cvs rdiff -u -r1.17 -r1.18 src/games/mille/mille.h
cvs rdiff -u -r1.16 -r1.17 src/games/mille/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/mille/extern.c
diff -u src/games/mille/extern.c:1.10 src/games/mille/extern.c:1.11
--- src/games/mille/extern.c:1.10 Wed Aug 12 04:07:27 2009
+++ src/games/mille/extern.c Tue Aug 16 07:14:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.c,v 1.10 2009/08/12 08:07:27 dholland Exp $ */
+/* $NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: extern.c,v 1.10 2009/08/12 08:07:27 dholland Exp $");
+__RCSID("$NetBSD: extern.c,v 1.11 2011/08/16 11:14:04 christos Exp $");
#endif
#endif /* not lint */
@@ -52,7 +52,6 @@
Saved; /* set if game just saved */
char Initstr[INITSTR_SIZE]; /* initial string for error field */
-const char *C_fmt = "%-18.18s"; /* format for printing cards */
const char *Fromfile = NULL; /* startup file for game */
static const char *const _cn[NUM_CARDS] = {/* Card name buffer */
"",
Index: src/games/mille/mille.h
diff -u src/games/mille/mille.h:1.17 src/games/mille/mille.h:1.18
--- src/games/mille/mille.h:1.17 Wed Aug 12 04:07:27 2009
+++ src/games/mille/mille.h Tue Aug 16 07:14:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mille.h,v 1.17 2009/08/12 08:07:27 dholland Exp $ */
+/* $NetBSD: mille.h,v 1.18 2011/08/16 11:14:04 christos Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -212,7 +212,8 @@
#define INITSTR_SIZE 100
extern char Initstr[INITSTR_SIZE];
-extern const char *C_fmt, *const *C_name, *Fromfile;
+extern const char *const *C_name, *Fromfile;
+#define C_fmt "%-18.18s"
extern int Card_no, End, Handstart, Movetype, Numgos,
Numneed[], Numseen[NUM_CARDS], Play, Window;
Index: src/games/mille/print.c
diff -u src/games/mille/print.c:1.16 src/games/mille/print.c:1.17
--- src/games/mille/print.c:1.16 Mon May 23 18:59:27 2011
+++ src/games/mille/print.c Tue Aug 16 07:14:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $ */
+/* $NetBSD: print.c,v 1.17 2011/08/16 11:14:04 christos Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: print.c,v 1.16 2011/05/23 22:59:27 joerg Exp $");
+__RCSID("$NetBSD: print.c,v 1.17 2011/08/16 11:14:04 christos Exp $");
#endif
#endif /* not lint */
@@ -115,7 +115,7 @@
*lc = c;
}
-static char Score_fmt[] = "%4d";
+#define Score_fmt "%4d"
void
prscore(bool for_real)
