KNF and WARNS=3

9 files changed, 81 insertions, 126 deletions

diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c
index d89654aa..fb55923b 100644
--- a/boggle/boggle/bog.c
+++ b/boggle/boggle/bog.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bog.c,v 1.19 2004/11/05 21:30:31 dsl Exp $	*/
+/*	$NetBSD: bog.c,v 1.20 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
 #if 0
 static char sccsid[] = "@(#)bog.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: bog.c,v 1.19 2004/11/05 21:30:31 dsl Exp $");
+__RCSID("$NetBSD: bog.c,v 1.20 2005/07/01 16:38:24 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -122,9 +122,7 @@ int reuse;
 int tlimit;
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	long seed;
 	int ch, done, i, selfuse, sflag;
@@ -281,8 +279,7 @@ main(argc, argv)
  * Return a pointer to a legal word or a null pointer when EOF is reached
  */
 char *
-batchword(fp)
-	FILE *fp;
+batchword(FILE *fp)
 {
 	int *p, *q;
 	char *w;
@@ -310,7 +307,7 @@ batchword(fp)
  * Keep track of the running stats
  */
 void
-playgame()
+playgame(void)
 {
 	int i, *p, *q;
 	time_t t;
@@ -431,9 +428,7 @@ timesup: ;
  * Return 1 on success, -1 on failure
  */
 int
-checkword(word, prev, path)
-	const char *word;
-	int prev, *path;
+checkword(const char *word, int prev, int *path)
 {
 	const char *p;
 	char *q;
@@ -515,8 +510,7 @@ checkword(word, prev, path)
  * the current board
  */
 int
-validword(word)
-	const char *word;
+validword(const char *word)
 {
 	int j;
 	const char *q, *w;
@@ -550,7 +544,7 @@ validword(word)
  * Assume both the dictionary and the player's words are already sorted
  */
 void
-checkdict()
+checkdict(void)
 {
 	char *p, *w;
 	const char **pw;
@@ -630,8 +624,7 @@ checkdict()
  * in ascending cube order, oth. make a random board
  */
 void
-newgame(b)
-	const char *b;
+newgame(const char *b)
 {
 	int i, p, q;
 	const char *tmp;
@@ -700,14 +693,13 @@ newgame(b)
 }
 
 int
-compar(p, q)
-	const void *p, *q;
+compar(const void *p, const void *q)
 {
 	return (strcmp(*(const char *const *)p, *(const char *const *)q));
 }
 
 void
-usage()
+usage(void)
 {
 	(void) fprintf(stderr,
 	    "usage: bog [-bd] [-s#] [-t#] [-w#] [+[+]] [boardspec]\n");
diff --git a/boggle/boggle/extern.h b/boggle/boggle/extern.h
index ba365615..05e5b9ac 100644
--- a/boggle/boggle/extern.h
+++ b/boggle/boggle/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
+/*	$NetBSD: extern.h,v 1.9 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -55,7 +55,8 @@ FILE	*opendict(const char *);
 void	 playgame(void);
 void	 prompt(const char *);
 void	 prtable(const char *const [],
-	    int, int, int, void (*)(const char *const [], int), int (*)(const char *const [], int));
+	    int, int, int, void (*)(const char *const [], int), 
+	    int (*)(const char *const [], int));
 void	 putstr(const char *);
 void	 redraw(void);
 void	 results(void);
diff --git a/boggle/boggle/help.c b/boggle/boggle/help.c
index 2ca00330..365431f0 100644
--- a/boggle/boggle/help.c
+++ b/boggle/boggle/help.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $	*/
+/*	$NetBSD: help.c,v 1.6 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $");
+__RCSID("$NetBSD: help.c,v 1.6 2005/07/01 16:38:24 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -48,8 +48,9 @@ __RCSID("$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $");
 #include "extern.h"
 
 extern int nlines;
+
 int
-help()
+help(void)
 {
 	int eof, i;
 	FILE *fp;
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index c21ddbd4..7efc8de5 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach.c,v 1.14 2004/11/05 21:30:31 dsl Exp $	*/
+/*	$NetBSD: mach.c,v 1.15 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)mach.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mach.c,v 1.14 2004/11/05 21:30:31 dsl Exp $");
+__RCSID("$NetBSD: mach.c,v 1.15 2005/07/01 16:38:24 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -87,9 +87,7 @@ static void	winch_catcher(int);
  * This is called once, when the program starts
  */
 int
-setup(sflag, seed)
-	int sflag;
-	time_t seed;
+setup(int sflag, time_t seed)
 {
 	if (tty_setup() < 0)
 		return(-1);
@@ -107,7 +105,7 @@ setup(sflag, seed)
  * This is called once, just before the program terminates
  */
 void
-cleanup()
+cleanup(void)
 {
 	tty_cleanup();
 }
@@ -117,7 +115,7 @@ cleanup()
  * stats
  */
 void
-results()
+results(void)
 {
 	int col, row;
 	int denom1, denom2;
@@ -147,17 +145,13 @@ results()
 }
 
 static void
-prword(base, indx)
-	const char *const base[];
-	int indx;
+prword(const char *const base[], int indx)
 {
 	printw("%s", base[indx]);
 }
 
 static int
-prwidth(base, indx)
-	const char *const base[];
-	int indx;
+prwidth(const char *const base[], int indx)
 {
 	return (strlen(base[indx]));
 }
@@ -168,8 +162,7 @@ prwidth(base, indx)
  * - doesn't accept words longer than MAXWORDLEN or containing caps
  */
 char *
-getline(q)
-	char *q;
+getline(char *q)
 {
 	int ch, done;
 	char *p;
@@ -263,21 +256,20 @@ getline(q)
 }
 
 int
-inputch()
+inputch(void)
 {
 	return (getch() & 0177);
 }
 
 void
-redraw()
+redraw(void)
 {
 	clearok(stdscr, 1);
 	refresh();
 }
 
 void
-flushin(fp)
-	FILE *fp;
+flushin(FILE *fp)
 {
 
 	(void) tcflush(fileno(fp), TCIFLUSH);
@@ -289,7 +281,7 @@ static int gone;
  * Stop the game timer
  */
 void
-stoptime()
+stoptime(void)
 {
 	time_t t;
 
@@ -301,7 +293,7 @@ stoptime()
  * Restart the game timer
  */
 void
-starttime()
+starttime(void)
 {
 	time_t t;
 
@@ -317,7 +309,7 @@ starttime()
  * There is no check for exceeding COLS
  */
 void
-startwords()
+startwords(void)
 {
 	crow = LIST_LINE;
 	ccol = LIST_COL;
@@ -334,8 +326,7 @@ startwords()
  * to start the next column
  */
 void
-addword(w)
-	const char *w;
+addword(const char *w)
 {
 	int n;
 
@@ -358,7 +349,7 @@ addword(w)
  * The current word is unacceptable so erase it
  */
 void
-badword()
+badword(void)
 {
 
 	move(crow, ccol);
@@ -371,8 +362,7 @@ badword()
  * No check for wild arg
  */
 void
-showword(n)
-	int n;
+showword(int n)
 {
 	int col, row;
 
@@ -400,7 +390,7 @@ showword(n)
  * Note: this function knows about the format of the board
  */
 void
-findword()
+findword(void)
 {
 	int c, col, found, i, r, row;
 	char buf[MAXWORDLEN + 1];
@@ -445,7 +435,8 @@ findword()
 		if (board[wordpath[i]] == 'q')
 			printw("Qu");
 		else
-			printw("%c", toupper((unsigned char)board[wordpath[i]]));
+			printw("%c", 
+			    toupper((unsigned char)board[wordpath[i]]));
 		move(r, c);
 		refresh();
 		delay(5);
@@ -460,7 +451,8 @@ findword()
 		if (board[wordpath[i]] == 'q')
 			printw("Qu");
 		else
-			printw("%c", toupper((unsigned char)board[wordpath[i]]));
+			printw("%c", 
+			    toupper((unsigned char)board[wordpath[i]]));
 	}
 	move(r, c);
 	clrtoeol();
@@ -471,9 +463,7 @@ findword()
  * Display a string at the current cursor position for the given number of secs
  */
 void
-showstr(str, delaysecs)
-	const char *str;
-	int delaysecs;
+showstr(const char *str, int delaysecs)
 {
 	addstr(str);
 	refresh();
@@ -484,8 +474,7 @@ showstr(str, delaysecs)
 }
 
 void
-putstr(s)
-	const char *s;
+putstr(const char *s)
 {
 	addstr(s);
 }
@@ -494,8 +483,7 @@ putstr(s)
  * Get a valid word and put it in the buffer
  */
 void
-getword(q)
-	char *q;
+getword(char *q)
 {
 	int ch, col, done, i, row;
 	char *p;
@@ -552,15 +540,13 @@ getword(q)
 }
 
 void
-showboard(b)
-	const char *b;
+showboard(const char *b)
 {
 	tty_showboard(b);
 }
 
 void
-prompt(mesg)
-	const char *mesg;
+prompt(const char *mesg)
 {
 	move(PROMPT_LINE, PROMPT_COL);
 	printw("%s", mesg);
@@ -569,7 +555,7 @@ prompt(mesg)
 }
 
 static int
-tty_setup()
+tty_setup(void)
 {
 	initscr();
 	raw();
@@ -590,10 +576,9 @@ tty_setup()
 }
 
 static void
-stop_catcher(signo)
-	int signo __attribute__((__unused__));
+stop_catcher(int signo __attribute__((__unused__)))
 {
-	sigset_t sigset, osigset;
+	sigset_t isigset, osigset;
 
 	stoptime();
 	noraw();
@@ -602,17 +587,16 @@ stop_catcher(signo)
 	refresh();
 
 	signal(SIGTSTP, SIG_DFL);
-	sigemptyset(&sigset);
-	sigaddset(&sigset, SIGTSTP);
-	sigprocmask(SIG_UNBLOCK, &sigset, &osigset);
+	sigemptyset(&isigset);
+	sigaddset(&isigset, SIGTSTP);
+	sigprocmask(SIG_UNBLOCK, &isigset, &osigset);
 	kill(0, SIGTSTP);
 	sigprocmask(SIG_SETMASK, &osigset, (sigset_t *)0);
 	signal(SIGTSTP, stop_catcher);
 }
  
 static void
-cont_catcher(signo)
-	int signo __attribute__((__unused__));
+cont_catcher(int signo __attribute__((__unused__)))
 {
 	noecho();
 	raw();
@@ -627,8 +611,7 @@ cont_catcher(signo)
  * It would mean reformatting the entire display
  */
 static void
-winch_catcher(signo)
-	int signo __attribute__((__unused__));
+winch_catcher(int signo __attribute__((__unused__)))
 {
 	struct winsize win;
 
@@ -641,7 +624,7 @@ winch_catcher(signo)
 }
 
 static void
-tty_cleanup()
+tty_cleanup(void)
 {
 	move(nlines - 1, 0);
 	refresh();
@@ -651,8 +634,7 @@ tty_cleanup()
 }
 
 static void
-tty_showboard(b)
-	const char *b;
+tty_showboard(const char *b)
 {
 	int i;
 	int line;
diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c
index 2326f875..cc33cfb3 100644
--- a/boggle/boggle/prtable.c
+++ b/boggle/boggle/prtable.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: prtable.c,v 1.8 2004/01/27 20:30:29 jsm Exp $	*/
+/*	$NetBSD: prtable.c,v 1.9 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: prtable.c,v 1.8 2004/01/27 20:30:29 jsm Exp $");
+__RCSID("$NetBSD: prtable.c,v 1.9 2005/07/01 16:38:24 jmc Exp $");
 #endif /* not lint */
 
 #include <curses.h>
@@ -63,11 +63,9 @@ static int	get_maxlen(const char *const [], int, int (*)(const char *const *, in
  * an index
  */
 void
-prtable(base, num, d_cols, width, prentry, length)
-	const char *const base[];
-	int num, d_cols, width;
-	void (*prentry)(const char *const [], int);
-	int (*length)(const char *const [], int);
+prtable(const char *const base[], int num, int d_cols, int width, 
+        void (*prentry)(const char *const [], int), 
+        int (*length)(const char *const [], int))
 {
         int c, j;
         int a, b, cols, loc, maxlen, nrows, z;
@@ -114,10 +112,8 @@ prtable(base, num, d_cols, width, prentry, length)
 }
 
 static int
-get_maxlen(base, num, length)
-	const char *const base[];
-	int num;
-	int (*length)(const char *const *, int);
+get_maxlen(const char *const base[], int num, 
+           int (*length)(const char *const *, int))
 {
 	int i, len, max;
 
diff --git a/boggle/boggle/timer.c b/boggle/boggle/timer.c
index 569d9aee..dc4dc69f 100644
--- a/boggle/boggle/timer.c
+++ b/boggle/boggle/timer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.c,v 1.9 2004/01/27 20:30:29 jsm Exp $	*/
+/*	$NetBSD: timer.c,v 1.10 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)timer.c	8.2 (Berkeley) 2/22/94";
 #else
-__RCSID("$NetBSD: timer.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
+__RCSID("$NetBSD: timer.c,v 1.10 2005/07/01 16:38:24 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -67,7 +67,7 @@ extern jmp_buf env;
  * Leave the cursor where it was initially
  */
 int
-timerch()
+timerch(void)
 {
 	time_t prevt, t;
 	int col, remaining, row;
@@ -99,19 +99,17 @@ timerch()
  * Returns 1 if input is ready, 0 oth.
  */
 static int
-waitch(delay)
-	int delay;
+waitch(int tdelay)
 {
 	struct pollfd set[1];
 
 	set[0].fd = STDIN_FILENO;
 	set[0].events = POLLIN;
-	return (poll(set, 1, delay));
+	return (poll(set, 1, tdelay));
 }
 
 void
-delay(tenths)
-	int tenths;
+delay(int tenths)
 {
 	struct timespec duration;
 
diff --git a/boggle/boggle/word.c b/boggle/boggle/word.c
index 2d5abb46..b6f14d7f 100644
--- a/boggle/boggle/word.c
+++ b/boggle/boggle/word.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $	*/
+/*	$NetBSD: word.c,v 1.8 2005/07/01 16:38:24 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)word.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $");
+__RCSID("$NetBSD: word.c,v 1.8 2005/07/01 16:38:24 jmc Exp $");
 #endif
 #endif /* not lint */
 
@@ -65,8 +65,7 @@ extern int wordlen;
  * NULL on end-of-file
  */
 char *
-nextword(fp)
-	FILE *fp;
+nextword(FILE *fp)
 {
 	int ch, pcount;
 	char *p;
@@ -108,10 +107,7 @@ nextword(fp)
  * Reset the state of nextword() and do the fseek()
  */
 long
-dictseek(fp, offset, ptrname)
-	FILE *fp;
-	long offset;
-	int ptrname;
+dictseek(FILE *fp, long offset, int ptrname)
 {
 	if (fp == NULL) {
 		if ((sp = dictspace + offset) >= dictend)
@@ -124,8 +120,7 @@ dictseek(fp, offset, ptrname)
 }
 
 FILE *
-opendict(dict)
-	const char *dict;
+opendict(const char *dict)
 {
 	FILE *fp;
 
@@ -138,8 +133,7 @@ opendict(dict)
  * Load the given dictionary and initialize the pointers
  */
 int
-loaddict(fp)
-	FILE *fp;
+loaddict(FILE *fp)
 {
 	struct stat statb;
 	long n;
@@ -185,8 +179,7 @@ loaddict(fp)
  * is made for lines that are too long
  */
 int
-loadindex(indexfile)
-	const char *indexfile;
+loadindex(const char *indexfile)
 {
 	int i, j;
 	char buf[BUFSIZ];
diff --git a/boggle/mkdict/mkdict.c b/boggle/mkdict/mkdict.c
index 31ffd7a8..6dc083b1 100644
--- a/boggle/mkdict/mkdict.c
+++ b/boggle/mkdict/mkdict.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdict.c,v 1.10 2005/04/19 20:19:09 rillig Exp $ */
+/* $NetBSD: mkdict.c,v 1.11 2005/07/01 16:38:24 jmc Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -40,7 +40,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkdict.c	8.1 (Berkeley) 6/11/93";
 #else
 static const char rcsid[] = 
-    "$NetBSD: mkdict.c,v 1.10 2005/04/19 20:19:09 rillig Exp $";
+    "$NetBSD: mkdict.c,v 1.11 2005/07/01 16:38:24 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,12 +59,8 @@ static const char rcsid[] =
 
 #include "bog.h"
 
-int main(int, char *[]);
-
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	char *p, *q;
 	int ch, common, nwords;
diff --git a/boggle/mkindex/mkindex.c b/boggle/mkindex/mkindex.c
index 657942ff..e572000a 100644
--- a/boggle/mkindex/mkindex.c
+++ b/boggle/mkindex/mkindex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $ */
+/* $NetBSD: mkindex.c,v 1.10 2005/07/01 16:38:24 jmc Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -40,7 +40,7 @@ static char copyright[] = "@(#) Copyright (c) 1993\n\
 static char sccsid[] = "@(#)mkindex.c	8.1 (Berkeley) 6/11/93";
 #else
 static char rcsid[] =
-    "$NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $";
+    "$NetBSD: mkindex.c,v 1.10 2005/07/01 16:38:24 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -49,7 +49,6 @@ static char rcsid[] =
 
 #include "bog.h"
 
-int main(void);
 char *nextword(FILE *, char *, int *, int *);
 
 int
@@ -96,10 +95,7 @@ main(void)
  * rlen to the strlen() of the real word
  */
 char *
-nextword(fp, buffer, clen, rlen)
-	FILE *fp;
-	char *buffer;
-	int *clen, *rlen;
+nextword(FILE *fp, char *buffer, int *clen, int *rlen)
 {
 	int ch, pcount;
 	char *p, *q;