KNF and WARNS=3

Author: jmc

games/adventure/crc.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $	*/
+/*	$NetBSD: crc.c,v 1.9 2005/07/01 00:03:36 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 5/31/93";
 static char ORIGINAL_sccsid[] = "@(#)crc.c	5.2 (Berkeley) 4/4/91";
 #else
-__RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
+__RCSID("$NetBSD: crc.c,v 1.9 2005/07/01 00:03:36 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -115,10 +115,9 @@ crc_start()
 	crcval = step = 0;
 }
 
+/* Process nr bytes at a time; ptr points to them */
 unsigned long
-crc(ptr, nr)		/* Process nr bytes at a time; ptr points to them */
-	const char   *ptr;
-	int     nr;
+crc(const char *ptr, int nr)
 {
 	int     i;
 	const char   *p;

games/adventure/done.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $	*/
+/*	$NetBSD: done.c,v 1.9 2005/07/01 00:03:36 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)done.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
+__RCSID("$NetBSD: done.c,v 1.9 2005/07/01 00:03:36 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $");
 #include "extern.h"
 
 int
-score()
+score(void)
 {				/* sort of like 20000 */
 	int     scor, i;
 	mxscor = scor = 0;
@@ -102,9 +102,10 @@ score()
 	return (scor);
 }
 
+/* entry=1 means goto 13000 */	/* game is over */
+/* entry=2 means goto 20000 */	/* 3=19000 */
 void
-done(entry)		/* entry=1 means goto 13000 */	/* game is over */
-	int     entry;	/* entry=2 means goto 20000 */	/* 3=19000 */
+done(int entry)
 {
 	int     i, sc;
 	if (entry == 1)
@@ -135,10 +136,9 @@ done(entry)		/* entry=1 means goto 13000 */	/* game is over */
 	exit(0);
 }
 
-
+/* label 90 */
 void
-die(entry)			/* label 90 */
-	int     entry;
+die(int entry)
 {
 	int     i;
 	if (entry != 99) {

games/adventure/hdr.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hdr.h,v 1.10 2003/08/07 09:36:50 agc Exp $	*/
+/*	$NetBSD: hdr.h,v 1.11 2005/07/01 00:03:36 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -83,11 +83,10 @@ extern struct hashtab {		/* hash table for vocabulary */
 }       voc[HTSIZE];
 #define SEED 1815622		/* "Encryption" seed */
 
-struct text
-	{
-		char   *seekadr;/* Msg start in virtual disk */
-		int     txtlen;	/* length of msg starting here */
-	};
+struct text {
+	char   *seekadr;/* Msg start in virtual disk */
+	int     txtlen;	/* length of msg starting here */
+};
 
 #define RTXSIZ  205
 extern	struct text rtext[RTXSIZ];	/* random text messages */
@@ -107,11 +106,11 @@ extern	struct text ltext[LOCSIZ];	/* long loc description */
 extern	struct text stext[LOCSIZ];	/* short loc descriptions */
 
 extern	struct travlist {		/* direcs & conditions of travel */
-		struct travlist *next;	/* ptr to next list entry */
-		int     conditions;	/* m in writeup (newloc / 1000) */
-		int     tloc;		/* n in writeup (newloc % 1000) */
-		int     tverb;		/* the verb that takes you there */
-	}      *travel[LOCSIZ], *tkk;	/* travel is closer to keys(...) */
+	struct travlist *next;	/* ptr to next list entry */
+	int     conditions;	/* m in writeup (newloc / 1000) */
+	int     tloc;		/* n in writeup (newloc % 1000) */
+	int     tverb;		/* the verb that takes you there */
+}      *travel[LOCSIZ], *tkk;	/* travel is closer to keys(...) */
 
 extern	int     atloc[LOCSIZ];
 
@@ -122,7 +121,7 @@ extern	int     actspk[35];		/* rtext msg for verb <n> */
 
 extern	int     cond[LOCSIZ];		/* various condition bits */
 
-	extern int setbit[16];		/* bit defn masks 1,2,4,... */
+extern	int	setbit[16];		/* bit defn masks 1,2,4,... */
 
 extern	int     hntmax;
 extern	int     hints[20][5];		/* info on hints */

games/adventure/init.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $	*/
+/*	$NetBSD: init.c,v 1.15 2005/07/01 00:03:36 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $");
+__RCSID("$NetBSD: init.c,v 1.15 2005/07/01 00:03:36 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,8 +57,8 @@ __RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $");
 
 int     blklin = TRUE;
 
-int     setbit[16] = {1, 2, 4, 010, 020, 040, 0100, 0200, 0400, 01000, 02000, 04000,
-010000, 020000, 040000, 0100000};
+int     setbit[16] = {1, 2, 4, 010, 020, 040, 0100, 0200, 0400, 01000, 02000, 
+		      04000, 010000, 020000, 040000, 0100000};
 
 int     datfd;			/* message file descriptor */
 volatile sig_atomic_t delhit;
@@ -125,17 +125,17 @@ int     turns, lmwarn, iwest, knfloc, detail,	/* various flags and
 
 int     demo, limit;
 
+/* everything for 1st time run */
 void
-init()			/* everything for 1st time run */
+init(void)
 {
 	rdata();		/* read data from orig. file */
 	linkdata();
 	poof();
 }
 
-char   *
-decr(a, b, c, d, e)
-	char    a, b, c, d, e;
+char *
+decr(int a, int b, int c, int d, int e)
 {
 	static char buf[6];
 
@@ -149,7 +149,7 @@ decr(a, b, c, d, e)
 }
 
 void
-linkdata()
+linkdata(void)
 {				/* secondary data manipulation */
 	int     i, j;
 
@@ -273,19 +273,17 @@ linkdata()
 	closng = panic = closed = scorng = FALSE;
 }
 
-
-
+/* come here if he hits a del */
 void
-trapdel(n)			/* come here if he hits a del */
-	int     n __attribute__((__unused__));
+trapdel(int n __attribute__((__unused__)))
 {
 	delhit = 1;		/* main checks, treats as QUIT */
 	signal(SIGINT, trapdel);/* catch subsequent DELs */
 }
 
 
 void
-startup()
+startup(void)
 {
 	demo = Start();
 	srand((int) (time((time_t *) NULL)));	/* random seed */