From 00b8e31689c6400d8ad915067f021b8e246df989 Mon Sep 17 00:00:00 2001 From: jsm Date: Sun, 25 Mar 2001 20:43:58 +0000 Subject: 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. --- hack/hack.trap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hack/hack.trap.c') diff --git a/hack/hack.trap.c b/hack/hack.trap.c index 55203b7e..ae2da877 100644 --- a/hack/hack.trap.c +++ b/hack/hack.trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.trap.c,v 1.5 1998/08/30 09:19:37 veego Exp $ */ +/* $NetBSD: hack.trap.c,v 1.6 2001/03/25 20:44:03 jsm Exp $ */ /* * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. @@ -6,7 +6,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.trap.c,v 1.5 1998/08/30 09:19:37 veego Exp $"); +__RCSID("$NetBSD: hack.trap.c,v 1.6 2001/03/25 20:44:03 jsm Exp $"); #endif /* not lint */ #include @@ -14,9 +14,9 @@ __RCSID("$NetBSD: hack.trap.c,v 1.5 1998/08/30 09:19:37 veego Exp $"); #include "extern.h" #include "def.mkroom.h" -char vowels[] = "aeiou"; +const char vowels[] = "aeiou"; -char *traps[] = { +const char *const traps[] = { " bear trap", "n arrow trap", " dart trap", @@ -243,7 +243,7 @@ mintrap(mtmp) void selftouch(arg) - char *arg; + const char *arg; { if (uwep && uwep->otyp == DEAD_COCKATRICE) { pline("%s touch the dead cockatrice.", arg); -- cgit v1.2.3-56-ge451