summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>1999-11-09 15:06:30 +0000
committerdrochner <drochner@NetBSD.org>1999-11-09 15:06:30 +0000
commit2f535b7f4641635ebb7b7c4cd74b664fbe325048 (patch)
treef940c29823f1a535c739bd6c2f9b4269df371e52
parent9015a6d9f684099dd01a207dd36230dd6a9da9b9 (diff)
downloadbsdgames-darwin-2f535b7f4641635ebb7b7c4cd74b664fbe325048.tar.gz
bsdgames-darwin-2f535b7f4641635ebb7b7c4cd74b664fbe325048.tar.zst
bsdgames-darwin-2f535b7f4641635ebb7b7c4cd74b664fbe325048.zip
Since our gcc doesn't warn about NULL format strings anymore, we can
fix the incorrect err(1, "%s", "") et al. Closes PR bin/7592 by cgd.
-rw-r--r--cribbage/instr.c6
-rw-r--r--fortune/fortune/fortune.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/cribbage/instr.c b/cribbage/instr.c
index 5de9b9e1..5c7738c0 100644
--- a/cribbage/instr.c
+++ b/cribbage/instr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: instr.c,v 1.8 1999/09/13 17:27:36 jsm Exp $ */
+/* $NetBSD: instr.c,v 1.9 1999/11/09 15:06:32 drochner Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)instr.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: instr.c,v 1.8 1999/09/13 17:27:36 jsm Exp $");
+__RCSID("$NetBSD: instr.c,v 1.9 1999/11/09 15:06:32 drochner Exp $");
#endif
#endif /* not lint */
@@ -90,7 +90,7 @@ instructions()
_exit(1);
}
execl("/bin/sh", "sh", "-c", path, NULL);
- warn("%s", "");
+ warn(NULL);
_exit(1);
default:
do {
diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c
index 86a17b7a..559039c7 100644
--- a/fortune/fortune/fortune.c
+++ b/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.21 1999/09/22 18:56:32 jsm Exp $ */
+/* $NetBSD: fortune.c,v 1.22 1999/11/09 15:06:33 drochner Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.21 1999/09/22 18:56:32 jsm Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.22 1999/11/09 15:06:33 drochner Exp $");
#endif
#endif /* not lint */
@@ -191,7 +191,7 @@ char *regcmp(), *regex();
regex_t *Re_pat = NULL;
# define RE_INIT() if (Re_pat == NULL && \
(Re_pat = calloc(sizeof(*Re_pat), 1)) == NULL)\
- err(1, "%s", "")
+ err(1, NULL)
# define RE_COMP(p) (regcomp(Re_pat, p, REG_EXTENDED))
# define BAD_COMP(f) ((f) != 0)
# define RE_EXEC(p) (!regexec(Re_pat, p, 0, NULL, 0))
@@ -859,7 +859,7 @@ do_malloc(size)
void *new;
if ((new = malloc(size)) == NULL)
- err(1, "%s", "");
+ err(1, NULL);
return new;
}
@@ -1243,7 +1243,7 @@ conv_pat(orig)
else
cnt++;
if ((new = malloc(cnt)) == NULL)
- err(1, "%s", "");
+ err(1, NULL);
for (sp = new; *orig != '\0'; orig++) {
if (islower(*orig)) {