From: jsm <jsm@NetBSD.org>
Date: Wed, 8 Sep 1999 21:45:25 +0000 (+0000)
Subject: Add `__noreturn__' and `__unused__' attributes where appropriate to
X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/commitdiff_plain/82852318e37fa7eddacc3dd162a2d16d3a7487b9

Add `__noreturn__' and `__unused__' attributes where appropriate to
the games.

This merges in all such remaining changes from the Linux port of the
NetBSD games, except in hunt (where substantial changes from OpenBSD
need to be looked at).

Most noreturn attributes were previously added in bin/6144, with some
others that were missed then in bin/8082.  Previous `unused'
attributes were covered in bin/6557, bin/8058 and other PRs (all these
PRs have already been handled and closed).
---

diff --git a/backgammon/common_source/subs.c b/backgammon/common_source/subs.c
index 6552e0f6..ed1ff479 100644
--- a/backgammon/common_source/subs.c
+++ b/backgammon/common_source/subs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subs.c,v 1.11 1999/07/26 20:50:44 hubertf Exp $	*/
+/*	$NetBSD: subs.c,v 1.12 1999/09/08 21:45:25 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subs.c,v 1.11 1999/07/26 20:50:44 hubertf Exp $");
+__RCSID("$NetBSD: subs.c,v 1.12 1999/09/08 21:45:25 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -446,7 +446,7 @@ fixtty(t)
 
 void
 getout(dummy)
-	int     dummy;
+	int     dummy __attribute__((__unused__));
 {
 	/* go to bottom of screen */
 	if (tflag) {
diff --git a/battlestar/com6.c b/battlestar/com6.c
index 50939f8e..87a0935b 100644
--- a/battlestar/com6.c
+++ b/battlestar/com6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com6.c,v 1.11 1999/07/21 03:56:53 hubertf Exp $	*/
+/*	$NetBSD: com6.c,v 1.12 1999/09/08 21:45:25 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com6.c,v 1.11 1999/07/21 03:56:53 hubertf Exp $");
+__RCSID("$NetBSD: com6.c,v 1.12 1999/09/08 21:45:25 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -92,7 +92,7 @@ die()
 
 void
 diesig(dummy)
-	int     dummy;
+	int     dummy __attribute__((__unused__));
 {
 	die();
 }
diff --git a/battlestar/fly.c b/battlestar/fly.c
index bbc81402..0182f103 100644
--- a/battlestar/fly.c
+++ b/battlestar/fly.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fly.c,v 1.7 1999/04/18 03:30:12 simonb Exp $	*/
+/*	$NetBSD: fly.c,v 1.8 1999/09/08 21:45:25 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)fly.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: fly.c,v 1.7 1999/04/18 03:30:12 simonb Exp $");
+__RCSID("$NetBSD: fly.c,v 1.8 1999/09/08 21:45:25 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -59,7 +59,7 @@ sig_t   oldsig;
 
 void
 succumb(dummy)
-	int     dummy;
+	int     dummy __attribute__((__unused__));
 {
 	if (oldsig == SIG_DFL) {
 		endfly();
@@ -245,7 +245,7 @@ blast()
 
 void
 moveenemy(dummy)
-	int     dummy;
+	int     dummy __attribute__((__unused__));
 {
 	double  d;
 	int     oldr, oldc;
diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c
index 4aa4ce32..6aacf1cd 100644
--- a/boggle/boggle/mach.c
+++ b/boggle/boggle/mach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mach.c,v 1.9 1999/09/08 21:17:44 jsm Exp $	*/
+/*	$NetBSD: mach.c,v 1.10 1999/09/08 21:45:26 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)mach.c	8.1 (Berkeley) 6/11/93";
 #else
-__RCSID("$NetBSD: mach.c,v 1.9 1999/09/08 21:17:44 jsm Exp $");
+__RCSID("$NetBSD: mach.c,v 1.10 1999/09/08 21:45:26 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -598,7 +598,7 @@ tty_setup()
 
 static void
 stop_catcher(signo)
-	int signo;
+	int signo __attribute__((__unused__));
 {
 	sigset_t sigset, osigset;
 
@@ -619,7 +619,7 @@ stop_catcher(signo)
  
 static void
 cont_catcher(signo)
-	int signo;
+	int signo __attribute__((__unused__));
 {
 	noecho();
 	raw();
@@ -635,7 +635,7 @@ cont_catcher(signo)
  */
 static void
 winch_catcher(signo)
-	int signo;
+	int signo __attribute__((__unused__));
 {
 	struct winsize win;
 
diff --git a/canfield/canfield/canfield.c b/canfield/canfield/canfield.c
index 3fac5848..0560e70c 100644
--- a/canfield/canfield/canfield.c
+++ b/canfield/canfield/canfield.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: canfield.c,v 1.12 1999/09/08 21:17:46 jsm Exp $	*/
+/*	$NetBSD: canfield.c,v 1.13 1999/09/08 21:45:26 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)canfield.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: canfield.c,v 1.12 1999/09/08 21:17:46 jsm Exp $");
+__RCSID("$NetBSD: canfield.c,v 1.13 1999/09/08 21:45:26 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -1742,7 +1742,7 @@ finish()
  */
 void
 cleanup(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 
 	total.thinktime += 1;
@@ -1766,7 +1766,7 @@ cleanup(dummy)
  */
 void
 askquit(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	move(msgrow, msgcol);
 	printw("Really wish to quit?    ");
diff --git a/cribbage/io.c b/cribbage/io.c
index 56278b77..201e2db3 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.11 1999/09/08 21:17:47 jsm Exp $	*/
+/*	$NetBSD: io.c,v 1.12 1999/09/08 21:45:26 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: io.c,v 1.11 1999/09/08 21:17:47 jsm Exp $");
+__RCSID("$NetBSD: io.c,v 1.12 1999/09/08 21:45:26 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -612,7 +612,7 @@ getline()
 
 void
 rint(signo)
-	int signo;
+	int signo __attribute__((__unused__));
 {
 	bye();
 	exit(1);
diff --git a/cribbage/score.c b/cribbage/score.c
index 00c8bb49..3d2a8707 100644
--- a/cribbage/score.c
+++ b/cribbage/score.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: score.c,v 1.7 1999/09/08 21:17:47 jsm Exp $	*/
+/*	$NetBSD: score.c,v 1.8 1999/09/08 21:45:26 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.7 1999/09/08 21:17:47 jsm Exp $");
+__RCSID("$NetBSD: score.c,v 1.8 1999/09/08 21:45:26 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -354,7 +354,7 @@ pegscore(crd, tbl, n, sum)
 int
 adjust(cb, tnv)
 	const CARD cb[];
-	CARD tnv;
+	CARD tnv __attribute__((__unused__));
 {
 	long scr;
 	int i, c0, c1;
diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c
index a2c1075a..09ba4c45 100644
--- a/fortune/fortune/fortune.c
+++ b/fortune/fortune/fortune.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fortune.c,v 1.16 1999/09/08 21:17:48 jsm Exp $	*/
+/*	$NetBSD: fortune.c,v 1.17 1999/09/08 21:45:27 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
 #if 0
 static char sccsid[] = "@(#)fortune.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fortune.c,v 1.16 1999/09/08 21:17:48 jsm Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.17 1999/09/08 21:45:27 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -757,7 +757,11 @@ is_dir(file)
 int
 is_fortfile(file, datp, posp, check_for_offend)
 	const char	*file;
-	char		**datp, **posp;
+	char		**datp, **posp
+# ifndef OK_TO_WRITE_DISK
+	__attribute__((__unused__))
+# endif
+	;
 	int	check_for_offend;
 {
 	int	i;
diff --git a/gomoku/main.c b/gomoku/main.c
index 5674fb99..e7f0448f 100644
--- a/gomoku/main.c
+++ b/gomoku/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 1999/09/08 21:17:49 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.7 1999/09/08 21:45:27 jsm Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.6 1999/09/08 21:17:49 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.7 1999/09/08 21:45:27 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -533,7 +533,7 @@ quit()
 
 void
 quitsig(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	quit();
 }
diff --git a/gomoku/pickmove.c b/gomoku/pickmove.c
index 1ddf29bf..31b309c2 100644
--- a/gomoku/pickmove.c
+++ b/gomoku/pickmove.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pickmove.c,v 1.6 1999/09/08 21:17:49 jsm Exp $	*/
+/*	$NetBSD: pickmove.c,v 1.7 1999/09/08 21:45:27 jsm Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)pickmove.c	8.2 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: pickmove.c,v 1.6 1999/09/08 21:17:49 jsm Exp $");
+__RCSID("$NetBSD: pickmove.c,v 1.7 1999/09/08 21:45:27 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -1048,7 +1048,7 @@ updatecombo(cbp, color)
 void
 appendcombo(cbp, color)
 	struct combostr *cbp;
-	int color;
+	int color __attribute__((__unused__));
 {
 	struct combostr *pcbp, *ncbp;
 
diff --git a/hangman/hangman.h b/hangman/hangman.h
index e9aa4f57..6ab760bf 100644
--- a/hangman/hangman.h
+++ b/hangman/hangman.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hangman.h,v 1.8 1999/09/08 21:17:50 jsm Exp $	*/
+/*	$NetBSD: hangman.h,v 1.9 1999/09/08 21:45:28 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -82,7 +82,7 @@ extern FILE *Dict;
 
 extern off_t Dict_size;
 
-void    die __P((int));
+void    die __P((int)) __attribute__((__noreturn__));
 void    endgame __P((void));
 int	main __P((void));
 void	getguess __P((void));
diff --git a/hangman/main.c b/hangman/main.c
index af579906..8d448e03 100644
--- a/hangman/main.c
+++ b/hangman/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.5 1998/09/11 13:42:03 hubertf Exp $	*/
+/*	$NetBSD: main.c,v 1.6 1999/09/08 21:45:28 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.5 1998/09/11 13:42:03 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.6 1999/09/08 21:45:28 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ main(void)
  */
 void
 die(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	mvcur(0, COLS - 1, LINES - 1, 0);
 	endwin();
diff --git a/mille/mille.c b/mille/mille.c
index a427286b..9991c500 100644
--- a/mille/mille.c
+++ b/mille/mille.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mille.c,v 1.7 1999/03/29 05:12:39 mrg Exp $	*/
+/*	$NetBSD: mille.c,v 1.8 1999/09/08 21:45:28 jsm Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
 #if 0
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: mille.c,v 1.7 1999/03/29 05:12:39 mrg Exp $");
+__RCSID("$NetBSD: mille.c,v 1.8 1999/09/08 21:45:28 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -143,7 +143,7 @@ main(ac, av)
  */
 void
 rub(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	(void)signal(SIGINT, SIG_IGN);
 	if (getyn(REALLYPROMPT))
diff --git a/mille/print.c b/mille/print.c
index 042b8162..4cf850c6 100644
--- a/mille/print.c
+++ b/mille/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.7 1999/09/08 21:17:51 jsm Exp $	*/
+/*	$NetBSD: print.c,v 1.8 1999/09/08 21:45:28 jsm Exp $	*/
 
 /*
  * Copyright (c) 1982, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.7 1999/09/08 21:17:51 jsm Exp $");
+__RCSID("$NetBSD: print.c,v 1.8 1999/09/08 21:45:28 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -122,7 +122,11 @@ static char	Score_fmt[] = "%4d";
 
 void
 prscore(for_real)
-	bool	for_real; 
+#ifdef EXTRAP
+	bool	for_real;
+#else
+	bool	for_real __attribute__((__unused__));
+#endif
 {
 	PLAY	*pp;
 	int	x;
diff --git a/monop/monop.c b/monop/monop.c
index f0cf83d1..001331cb 100644
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: monop.c,v 1.6 1999/08/21 10:40:03 simonb Exp $	*/
+/*	$NetBSD: monop.c,v 1.7 1999/09/08 21:45:28 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)monop.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: monop.c,v 1.6 1999/08/21 10:40:03 simonb Exp $");
+__RCSID("$NetBSD: monop.c,v 1.7 1999/09/08 21:45:28 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -92,7 +92,7 @@ main(ac, av)
 /*ARGSUSED*/
 static void
 do_quit(n)
-	int n;
+	int n __attribute__((__unused__));
 {
 	quit();
 }
diff --git a/phantasia/io.c b/phantasia/io.c
index 989a67db..17da74b1 100644
--- a/phantasia/io.c
+++ b/phantasia/io.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: io.c,v 1.4 1999/09/08 21:17:54 jsm Exp $	*/
+/*	$NetBSD: io.c,v 1.5 1999/09/08 21:45:29 jsm Exp $	*/
 
 /*
  * io.c - input/output routines for Phantasia
@@ -241,7 +241,7 @@ getanswer(choices, def)
 
 void
 catchalarm(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	longjmp(Timeoenv, 1);
 }
diff --git a/phantasia/phantglobs.h b/phantasia/phantglobs.h
index 008ae1de..8e255d74 100644
--- a/phantasia/phantglobs.h
+++ b/phantasia/phantglobs.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: phantglobs.h,v 1.6 1999/09/08 21:17:54 jsm Exp $	*/
+/*	$NetBSD: phantglobs.h,v 1.7 1999/09/08 21:45:29 jsm Exp $	*/
 
 /*
  * phantglobs.h - global declarations for Phantasia
@@ -73,7 +73,7 @@ void	awardtreasure __P((void));
 void	battleplayer __P((long));
 void	callmonster __P((int));
 void	cancelmonster __P((void));
-void	catchalarm __P((int));
+void	catchalarm __P((int)) __attribute__((__noreturn__));
 void	changestats __P((bool));
 void	checkbattle __P((void));
 void	checktampered __P((void));
diff --git a/random/random.c b/random/random.c
index f4c4f1d4..f817a5d8 100644
--- a/random/random.c
+++ b/random/random.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: random.c,v 1.5 1997/10/12 01:14:22 lukem Exp $	*/
+/*	$NetBSD: random.c,v 1.6 1999/09/08 21:45:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\
 #if 0
 static char sccsid[] = "@(#)random.c	8.6 (Berkeley) 6/1/94";
 #else
-__RCSID("$NetBSD: random.c,v 1.5 1997/10/12 01:14:22 lukem Exp $");
+__RCSID("$NetBSD: random.c,v 1.6 1999/09/08 21:45:29 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,7 +62,7 @@ __RCSID("$NetBSD: random.c,v 1.5 1997/10/12 01:14:22 lukem Exp $");
 #include <limits.h>
 
 int  main __P((int, char **));
-void usage __P((void));
+void usage __P((void)) __attribute__((__noreturn__));
 
 int
 main(argc, argv)
diff --git a/robots/main.c b/robots/main.c
index ce7f8cf5..f2f9c97f 100644
--- a/robots/main.c
+++ b/robots/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.9 1999/09/08 21:17:57 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.10 1999/09/08 21:45:29 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.9 1999/09/08 21:17:57 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 1999/09/08 21:45:29 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -185,7 +185,7 @@ __cputchar(ch)
  */
 void
 quit(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	endwin();
 	exit(0);
diff --git a/rogue/init.c b/rogue/init.c
index b6a4937c..c410eba3 100644
--- a/rogue/init.c
+++ b/rogue/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.7 1998/11/10 13:01:32 hubertf Exp $	*/
+/*	$NetBSD: init.c,v 1.8 1999/09/08 21:45:30 jsm Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.7 1998/11/10 13:01:32 hubertf Exp $");
+__RCSID("$NetBSD: init.c,v 1.8 1999/09/08 21:45:30 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -208,7 +208,7 @@ stop_window()
 
 void
 byebye(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	md_ignore_signals();
 	if (ask_quit) {
@@ -221,7 +221,7 @@ byebye(dummy)
 
 void
 onintr(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	md_ignore_signals();
 	if (cant_int) {
@@ -235,7 +235,7 @@ onintr(dummy)
 
 void
 error_save(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	save_is_interactive = 0;
 	save_into_file(error_file);
diff --git a/rogue/rogue.h b/rogue/rogue.h
index 6375bda0..92d49c09 100644
--- a/rogue/rogue.h
+++ b/rogue/rogue.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rogue.h,v 1.8 1998/11/10 13:01:32 hubertf Exp $	*/
+/*	$NetBSD: rogue.h,v 1.9 1999/09/08 21:45:30 jsm Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -587,7 +587,7 @@ boolean	is_pack_letter __P((short *, unsigned short *));
 boolean	is_passable __P((int, int));
 boolean	is_vowel __P((short));
 void	kick_into_pack __P((void));
-void	killed_by __P((const object *, short));
+void	killed_by __P((const object *, short)) __attribute__((__noreturn__));
 long	lget_number __P((const char *));
 void	light_passage __P((int, int));
 void	light_up_room __P((int));
@@ -747,7 +747,7 @@ void	wanderer __P((void));
 void	wdrain_life __P((object *));
 void	wear __P((void));
 void	wield __P((void));
-void	win __P((void));
+void	win __P((void)) __attribute__((__noreturn__));
 void	wizardize __P((void));
 void	write_pack __P((const object *, FILE *));
 void	write_string __P((char *, FILE *));
diff --git a/sail/extern.h b/sail/extern.h
index 80a274f5..8cd2ccd1 100644
--- a/sail/extern.h
+++ b/sail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.10 1999/09/08 21:17:58 jsm Exp $ */
+/*	$NetBSD: extern.h,v 1.11 1999/09/08 21:45:30 jsm Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -372,7 +372,7 @@ void choke __P((int)) __attribute__((__noreturn__));
 void child __P((int));
 
 /* pl_2.c */
-void play __P((void));
+void play __P((void)) __attribute__((__noreturn__));
 
 /* pl_3.c */
 void acceptcombat __P((void));
diff --git a/sail/pl_1.c b/sail/pl_1.c
index 979d0c56..b9512e47 100644
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl_1.c,v 1.6 1999/02/10 00:45:46 hubertf Exp $	*/
+/*	$NetBSD: pl_1.c,v 1.7 1999/09/08 21:45:30 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_1.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_1.c,v 1.6 1999/02/10 00:45:46 hubertf Exp $");
+__RCSID("$NetBSD: pl_1.c,v 1.7 1999/09/08 21:45:30 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -122,7 +122,7 @@ int conditions;
 /*ARGSUSED*/
 void
 choke(n)
-	int n;
+	int n __attribute__((__unused__));
 {
 	leave(LEAVE_QUIT);
 }
@@ -130,7 +130,7 @@ choke(n)
 /*ARGSUSED*/
 void
 child(n)
-	int n;
+	int n __attribute__((__unused__));
 {
 	union wait status;
 	int pid;
diff --git a/sail/pl_7.c b/sail/pl_7.c
index b281cd81..ad60b95b 100644
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pl_7.c,v 1.11 1999/09/08 21:17:59 jsm Exp $	*/
+/*	$NetBSD: pl_7.c,v 1.12 1999/09/08 21:45:30 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)pl_7.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pl_7.c,v 1.11 1999/09/08 21:17:59 jsm Exp $");
+__RCSID("$NetBSD: pl_7.c,v 1.12 1999/09/08 21:45:30 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -94,7 +94,7 @@ cleanupscreen()
 /*ARGSUSED*/
 void
 newturn(n)
-	int n;
+	int n __attribute__((__unused__));
 {
 	repaired = loaded = fired = changed = 0;
 	movebuf[0] = '\0';
diff --git a/snake/snake/snake.c b/snake/snake/snake.c
index 49507b59..cd1957e5 100644
--- a/snake/snake/snake.c
+++ b/snake/snake/snake.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: snake.c,v 1.10 1999/09/08 21:17:59 jsm Exp $	*/
+/*	$NetBSD: snake.c,v 1.11 1999/09/08 21:45:31 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)snake.c	8.2 (Berkeley) 1/7/94";
 #else
-__RCSID("$NetBSD: snake.c,v 1.10 1999/09/08 21:17:59 jsm Exp $");
+__RCSID("$NetBSD: snake.c,v 1.11 1999/09/08 21:45:31 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -905,7 +905,7 @@ winnings(won)
 
 void
 stop(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	signal(SIGINT, SIG_IGN);
 	ll();
diff --git a/snake/snake/snake.h b/snake/snake/snake.h
index 0199ff52..fd414f4d 100644
--- a/snake/snake/snake.h
+++ b/snake/snake/snake.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: snake.h,v 1.12 1999/09/08 21:18:00 jsm Exp $	*/
+/*	$NetBSD: snake.h,v 1.13 1999/09/08 21:45:31 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -99,7 +99,7 @@ void		home __P((void));
 void		length __P((int));
 void		ll __P((void));
 void		logit __P((const char *));
-void		mainloop __P((void));
+void		mainloop __P((void)) __attribute__((__noreturn__));
 void		move __P((struct point *));
 void		nd __P((void));
 void		outch __P((int));
diff --git a/tetris/screen.c b/tetris/screen.c
index c4a49fab..f27fb552 100644
--- a/tetris/screen.c
+++ b/tetris/screen.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: screen.c,v 1.11 1999/09/08 21:18:00 jsm Exp $	*/
+/*	$NetBSD: screen.c,v 1.12 1999/09/08 21:45:31 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -67,7 +67,7 @@ static struct termios oldtt;
 static void (*tstp) __P((int));
 
 static	void	scr_stop __P((int));
-static	void	stopset __P((int));
+static	void	stopset __P((int)) __attribute__((__noreturn__));
 
 
 /*
diff --git a/tetris/tetris.c b/tetris/tetris.c
index 3ffbe8ff..3cf9f360 100644
--- a/tetris/tetris.c
+++ b/tetris/tetris.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tetris.c,v 1.10 1999/09/08 21:18:01 jsm Exp $	*/
+/*	$NetBSD: tetris.c,v 1.11 1999/09/08 21:45:31 jsm Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -304,7 +304,7 @@ main(argc, argv)
 
 void
 onintr(signo)
-	int signo;
+	int signo __attribute__((__unused__));
 {
 	scr_clear();
 	scr_end();
diff --git a/trek/abandon.c b/trek/abandon.c
index 9b872564..872d15d1 100644
--- a/trek/abandon.c
+++ b/trek/abandon.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $	*/
+/*	$NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)abandon.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $");
+__RCSID("$NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,7 +73,7 @@ __RCSID("$NetBSD: abandon.c,v 1.4 1997/10/12 21:24:25 christos Exp $");
 /*ARGSUSED*/
 void
 abandon(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	struct quad	*q;
 	int		i;
diff --git a/trek/capture.c b/trek/capture.c
index 1325b813..93a9d253 100644
--- a/trek/capture.c
+++ b/trek/capture.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $	*/
+/*	$NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)capture.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $");
+__RCSID("$NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,7 +62,7 @@ __RCSID("$NetBSD: capture.c,v 1.4 1997/10/12 21:24:29 christos Exp $");
 /*ARGSUSED*/
 void
 capture(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i;
 	struct kling	*k;
diff --git a/trek/cgetc.c b/trek/cgetc.c
index f1d4e0f7..19d8b855 100644
--- a/trek/cgetc.c
+++ b/trek/cgetc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $	*/
+/*	$NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cgetc.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $");
+__RCSID("$NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: cgetc.c,v 1.4 1997/10/12 21:24:30 christos Exp $");
 # include	"trek.h"
 
 char	cgetc(i)
-int	i;
+int	i __attribute__((__unused__));
 {
 	return ( getchar() );
 }
diff --git a/trek/computer.c b/trek/computer.c
index cb08ae6d..d6ebe9cb 100644
--- a/trek/computer.c
+++ b/trek/computer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: computer.c,v 1.6 1999/07/21 13:19:10 hubertf Exp $	*/
+/*	$NetBSD: computer.c,v 1.7 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)computer.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: computer.c,v 1.6 1999/07/21 13:19:10 hubertf Exp $");
+__RCSID("$NetBSD: computer.c,v 1.7 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -113,7 +113,7 @@ static void prkalc __P((int, double));
 /*ARGSUSED*/
 void
 computer(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		ix, iy;
 	int		i, j;
diff --git a/trek/dcrept.c b/trek/dcrept.c
index a01d4b2e..a3e6e55d 100644
--- a/trek/dcrept.c
+++ b/trek/dcrept.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $	*/
+/*	$NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dcrept.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $");
+__RCSID("$NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: dcrept.c,v 1.4 1997/10/12 21:24:38 christos Exp $");
 /*ARGSUSED*/
 void
 dcrept(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i, f;
 	double		x;
diff --git a/trek/destruct.c b/trek/destruct.c
index 86799d27..eac87c53 100644
--- a/trek/destruct.c
+++ b/trek/destruct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $	*/
+/*	$NetBSD: destruct.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)destruct.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $");
+__RCSID("$NetBSD: destruct.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ __RCSID("$NetBSD: destruct.c,v 1.4 1997/10/12 21:24:40 christos Exp $");
 /*ARGSUSED*/
 void
 destruct(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	char		checkpass[15];
 	int	i, j;
diff --git a/trek/dock.c b/trek/dock.c
index 74d1ea7c..5af80f9c 100644
--- a/trek/dock.c
+++ b/trek/dock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $	*/
+/*	$NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dock.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $");
+__RCSID("$NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ __RCSID("$NetBSD: dock.c,v 1.4 1997/10/12 21:24:41 christos Exp $");
 /*ARGSUSED*/
 void
 dock(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i, j;
 	int		ok;
@@ -137,7 +137,7 @@ dock(v)
 /*ARGSUSED*/
 void
 undock(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	struct event	*e;
 	int		i;
diff --git a/trek/dumpgame.c b/trek/dumpgame.c
index 16207774..b9bd0503 100644
--- a/trek/dumpgame.c
+++ b/trek/dumpgame.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumpgame.c,v 1.6 1998/09/11 14:26:19 hubertf Exp $	*/
+/*	$NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)dumpgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dumpgame.c,v 1.6 1998/09/11 14:26:19 hubertf Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -87,7 +87,7 @@ struct dump	Dump_template[] =
 /*ARGSUSED*/
 void
 dumpgame(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		version;
 	int		fd;
diff --git a/trek/help.c b/trek/help.c
index d2696a22..41c9413b 100644
--- a/trek/help.c
+++ b/trek/help.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: help.c,v 1.5 1999/07/21 13:19:10 hubertf Exp $	*/
+/*	$NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.5 1999/07/21 13:19:10 hubertf Exp $");
+__RCSID("$NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -73,7 +73,7 @@ const char	*const Cntvect[3] =
 /*ARGSUSED*/
 void
 help(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i;
 	double		dist, x;
diff --git a/trek/impulse.c b/trek/impulse.c
index 490f52b7..cb4f08b3 100644
--- a/trek/impulse.c
+++ b/trek/impulse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $	*/
+/*	$NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)impulse.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $");
+__RCSID("$NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: impulse.c,v 1.4 1997/10/12 21:24:54 christos Exp $");
 /*ARGSUSED*/
 void
 impulse(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		course;
 	int		power;
diff --git a/trek/lrscan.c b/trek/lrscan.c
index 178cc477..60569480 100644
--- a/trek/lrscan.c
+++ b/trek/lrscan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $	*/
+/*	$NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)lrscan.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $");
+__RCSID("$NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -60,7 +60,7 @@ __RCSID("$NetBSD: lrscan.c,v 1.4 1997/10/12 21:24:59 christos Exp $");
 /*ARGSUSED*/
 void
 lrscan(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i, j;
 	struct quad	*q;
diff --git a/trek/phaser.c b/trek/phaser.c
index 8273fe8b..96ef5372 100644
--- a/trek/phaser.c
+++ b/trek/phaser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: phaser.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $	*/
+/*	$NetBSD: phaser.c,v 1.7 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)phaser.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: phaser.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.7 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -99,7 +99,7 @@ struct banks
 /*ARGSUSED*/
 void
 phaser(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		i;
 	int		j;
diff --git a/trek/play.c b/trek/play.c
index fe1f2200..3fbeac20 100644
--- a/trek/play.c
+++ b/trek/play.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $	*/
+/*	$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: play.c,v 1.6 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -89,7 +89,7 @@ const struct cvntab	Comtab[] =
 /*ARGSUSED*/
 void
 myreset(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	extern jmp_buf env;
 
diff --git a/trek/rest.c b/trek/rest.c
index 216018b9..a2f8310e 100644
--- a/trek/rest.c
+++ b/trek/rest.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $	*/
+/*	$NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)rest.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $");
+__RCSID("$NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,7 +63,7 @@ __RCSID("$NetBSD: rest.c,v 1.4 1997/10/12 21:25:10 christos Exp $");
 /*ARGSUSED*/
 void
 rest(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	double		t;
 	int		percent;
diff --git a/trek/setwarp.c b/trek/setwarp.c
index e42f5434..56ec60f4 100644
--- a/trek/setwarp.c
+++ b/trek/setwarp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $	*/
+/*	$NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setwarp.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $");
+__RCSID("$NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,7 +56,7 @@ __RCSID("$NetBSD: setwarp.c,v 1.4 1997/10/12 21:25:16 christos Exp $");
 /*ARGSUSED*/
 void
 setwarp(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	double	warpfac;
 
diff --git a/trek/torped.c b/trek/torped.c
index 90f30982..b48199bb 100644
--- a/trek/torped.c
+++ b/trek/torped.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: torped.c,v 1.4 1997/10/12 21:25:22 christos Exp $	*/
+/*	$NetBSD: torped.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)torped.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: torped.c,v 1.4 1997/10/12 21:25:22 christos Exp $");
+__RCSID("$NetBSD: torped.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ static int randcourse __P((int));
 /*ARGSUSED*/
 void
 torped(v)
-	int v;
+	int v __attribute__((__unused__));
 {
 	int		ix, iy;
 	double		x, y, dx, dy;
diff --git a/trek/trek.h b/trek/trek.h
index a5686e7e..db330782 100644
--- a/trek/trek.h
+++ b/trek/trek.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: trek.h,v 1.6 1999/07/21 13:19:11 hubertf Exp $	*/
+/*	$NetBSD: trek.h,v 1.7 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -459,7 +459,7 @@ void killd __P((int, int , int));
 void klmove __P((int));
 
 /* lose.c */
-void lose __P((int));
+void lose __P((int)) __attribute__((__noreturn__));
 
 /* lrscan.c */
 void lrscan __P((int));
@@ -477,8 +477,8 @@ void out __P((int));
 void phaser __P((int));
 
 /* play.c */
-void myreset __P((int));
-void play __P((void));
+void myreset __P((int)) __attribute__((__noreturn__));
+void play __P((void)) __attribute__((__noreturn__));
 
 /* ram.c */
 void ram __P((int, int ));
@@ -529,4 +529,4 @@ void dowarp __P((int));
 void warp __P((int, int, double));
 
 /* win.c */
-void win __P((void));
+void win __P((void)) __attribute__((__noreturn__));
diff --git a/trek/visual.c b/trek/visual.c
index 5c61fbfa..26fd5b21 100644
--- a/trek/visual.c
+++ b/trek/visual.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: visual.c,v 1.4 1997/10/12 21:25:26 christos Exp $	*/
+/*	$NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)visual.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: visual.c,v 1.4 1997/10/12 21:25:26 christos Exp $");
+__RCSID("$NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -74,7 +74,7 @@ struct xy	Visdelta[11] =
 /*ARGSUSED*/
 void
 visual(z)
-	int z;
+	int z __attribute__((__unused__));
 {
 	int		ix, iy;
 	int		co;
diff --git a/worm/worm.c b/worm/worm.c
index 53002881..34ef2cea 100644
--- a/worm/worm.c
+++ b/worm/worm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: worm.c,v 1.13 1999/09/08 21:18:01 jsm Exp $	*/
+/*	$NetBSD: worm.c,v 1.14 1999/09/08 21:45:34 jsm Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)worm.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: worm.c,v 1.13 1999/09/08 21:18:01 jsm Exp $");
+__RCSID("$NetBSD: worm.c,v 1.14 1999/09/08 21:45:34 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -191,7 +191,7 @@ leave(dummy)
 
 void
 wake(dummy)
-	int dummy;
+	int dummy __attribute__((__unused__));
 {
 	signal(SIGALRM, wake);
 	fflush(stdout);