summaryrefslogtreecommitdiffstats
path: root/hack/hack.potion.c
diff options
context:
space:
mode:
authorjsm <jsm@NetBSD.org>2001-03-25 20:43:58 +0000
committerjsm <jsm@NetBSD.org>2001-03-25 20:43:58 +0000
commit00b8e31689c6400d8ad915067f021b8e246df989 (patch)
treeeb00203724cf2a378ca54c9419738dd06661f34c /hack/hack.potion.c
parent57d9770b2eb590f5cad0b445cdbb91acb168736f (diff)
downloadbsdgames-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.potion.c')
-rw-r--r--hack/hack.potion.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hack/hack.potion.c b/hack/hack.potion.c
index a94df1d9..477058c5 100644
--- a/hack/hack.potion.c
+++ b/hack/hack.potion.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $ */
+/* $NetBSD: hack.potion.c,v 1.5 2001/03/25 20:44:02 jsm Exp $ */
/*
* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.potion.c,v 1.4 1997/10/19 16:58:48 christos Exp $");
+__RCSID("$NetBSD: hack.potion.c,v 1.5 2001/03/25 20:44:02 jsm Exp $");
#endif /* not lint */
#include "hack.h"
@@ -224,7 +224,7 @@ pluslvl()
void
strange_feeling(obj, txt)
struct obj *obj;
- char *txt;
+ const char *txt;
{
if (flags.beginner)
pline("You have a strange feeling for a moment, then it passes.");
@@ -235,7 +235,7 @@ strange_feeling(obj, txt)
useup(obj);
}
-char *bottlenames[] = {
+const char *const bottlenames[] = {
"bottle", "phial", "flagon", "carafe", "flask", "jar", "vial"
};
@@ -244,7 +244,7 @@ potionhit(mon, obj)
struct monst *mon;
struct obj *obj;
{
- char *botlnam = bottlenames[rn2(SIZE(bottlenames))];
+ const char *botlnam = bottlenames[rn2(SIZE(bottlenames))];
boolean uclose, isyou = (mon == &youmonst);
if (isyou) {