diff options
| author |   jsm <jsm@NetBSD.org> | 2001-03-25 20:43:58 +0000 |
|---|---|---|
| committer | jsm <jsm@NetBSD.org> | 2001-03-25 20:43:58 +0000 |
| commit | 00b8e31689c6400d8ad915067f021b8e246df989 (patch) | |
| tree | eb00203724cf2a378ca54c9419738dd06661f34c /hack/hack.do_name.c | |
| parent | 57d9770b2eb590f5cad0b445cdbb91acb168736f (diff) | |
| download | bsdgames-darwin-00b8e31689c6400d8ad915067f021b8e246df989.tar.gz bsdgames-darwin-00b8e31689c6400d8ad915067f021b8e246df989.tar.zst bsdgames-darwin-00b8e31689c6400d8ad915067f021b8e246df989.zip | |
Make mostly gcc -W clean, and other cleanup:
Use const.
Add __noreturn__ attributes.
Add a __format__ attribute.
Add __unused__ attributes.
Use symbolic constants for open() and lseek().
Declare types of all function parameters; convert some function
definitions to ISO C form.
Ensure standard file descriptors are open on startup.
Check for errors writing output of makedefs.
Avoid duplicate definitions of variables.
Diffstat (limited to 'hack/hack.do_name.c')
| -rw-r--r-- | hack/hack.do_name.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hack/hack.do_name.c b/hack/hack.do_name.c index 482c5e98..e6752e46 100644 --- a/hack/hack.do_name.c +++ b/hack/hack.do_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do_name.c,v 1.4 1997/10/19 16:57:46 christos Exp $ */ +/* $NetBSD: hack.do_name.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. @@ -6,7 +6,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: hack.do_name.c,v 1.4 1997/10/19 16:57:46 christos Exp $"); +__RCSID("$NetBSD: hack.do_name.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); #endif /* not lint */ #include <stdlib.h> @@ -16,7 +16,7 @@ __RCSID("$NetBSD: hack.do_name.c,v 1.4 1997/10/19 16:57:46 christos Exp $"); coord getpos(force, goal) int force; - char *goal; + const char *goal; { int cx, cy, i, c; coord cc; @@ -202,7 +202,7 @@ docall(obj) *str1 = str; } -char *ghostnames[] = {/* these names should have length < PL_NSIZ */ +const char *const ghostnames[] = {/* these names should have length < PL_NSIZ */ "adri", "andries", "andreas", "bert", "david", "dirk", "emile", "frans", "fred", "greg", "hether", "jay", "john", "jon", "kay", "kenny", "maud", "michiel", "mike", "peter", "robert", "ron", @@ -222,7 +222,7 @@ xmonnam(mtmp, vb) switch (mtmp->data->mlet) { case ' ': { - char *gn = (char *) mtmp->mextra; + const char *gn = (char *) mtmp->mextra; if (!*gn) { /* might also look in scorefile */ gn = ghostnames[rn2(SIZE(ghostnames))]; if (!rn2(2)) @@ -277,7 +277,7 @@ Monnam(mtmp) char * amonnam(mtmp, adj) struct monst *mtmp; - char *adj; + const char *adj; { char *bp = monnam(mtmp); static char buf[BUFSZ]; /* %% */ @@ -291,7 +291,7 @@ amonnam(mtmp, adj) char * Amonnam(mtmp, adj) struct monst *mtmp; - char *adj; + const char *adj; { char *bp = amonnam(mtmp, adj); |