remove unused function return values (PR#6079 by Joseph Myers <jsm28@cam.ac.uk>)

4 files changed, 22 insertions, 31 deletions

diff --git a/adventure/done.c b/adventure/done.c
index 7d2ba4b1..6d2856bc 100644
--- a/adventure/done.c
+++ b/adventure/done.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: done.c,v 1.5 1997/10/11 01:53:23 lukem Exp $	*/
+/*	$NetBSD: done.c,v 1.6 1998/09/13 15:21:36 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)done.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: done.c,v 1.5 1997/10/11 01:53:23 lukem Exp $");
+__RCSID("$NetBSD: done.c,v 1.6 1998/09/13 15:21:36 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -139,7 +139,7 @@ done(entry)		/* entry=1 means goto 13000 */	/* game is over */
 }
 
 
-int
+void
 die(entry)			/* label 90 */
 	int     entry;
 {
@@ -171,5 +171,4 @@ die(entry)			/* label 90 */
 	}
 	loc = 3;
 	oldloc = loc;
-	return (2000);
 }
diff --git a/adventure/extern.h b/adventure/extern.h
index c1e6bf02..85058814 100644
--- a/adventure/extern.h
+++ b/adventure/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.8 1998/09/13 00:07:24 hubertf Exp $	*/
+/*	$NetBSD: extern.h,v 1.9 1998/09/13 15:21:37 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@@ -37,8 +37,8 @@ unsigned long crc __P((const char *, int));
 
 /* done.c */
 int score __P((void));
-void done __P((int));
-int die __P((int));
+void done __P((int)) __attribute__((__noreturn__));
+void die __P((int));
 
 /* init.c */
 void init __P((void));
@@ -90,9 +90,9 @@ int march __P((void));
 int mback __P((void));
 int specials __P((void));
 int trbridge __P((void));
-int badmove __P((void));
-int bug __P((int)) __attribute__((__noreturn__));
-int checkhints __P((void));
+void badmove __P((void));
+void bug __P((int)) __attribute__((__noreturn__));
+void checkhints __P((void));
 int trsay __P((void));
 int trtake __P((void));
 int dropper __P((void));
@@ -102,8 +102,8 @@ int trkill __P((void));
 int trtoss __P((void));
 int trfeed __P((void));
 int trfill __P((void));
-int closing __P((void));
-int caveclose __P((void));
+void closing __P((void));
+void caveclose __P((void));
 
 /* vocab.c */
 void dstroy __P((int));
diff --git a/adventure/main.c b/adventure/main.c
index 2577d567..cf5e268a 100644
--- a/adventure/main.c
+++ b/adventure/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.10 1998/09/11 14:51:18 hubertf Exp $	*/
+/*	$NetBSD: main.c,v 1.11 1998/09/13 15:21:37 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -48,7 +48,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/2/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.10 1998/09/11 14:51:18 hubertf Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 1998/09/13 15:21:37 hubertf Exp $");
 #endif
 #endif /* not lint */
 
@@ -286,12 +286,8 @@ l8:
 		case 2:
 			continue;	/* i.e. goto l2 */
 		case 99:
-			switch (die(99)) {
-			case 2000:
-				goto l2000;
-			default:
-				bug(111);
-			}
+			die(99);
+			goto l2000;
 		default:
 			bug(110);
 		}
diff --git a/adventure/subr.c b/adventure/subr.c
index 1fba3b0c..06901dc8 100644
--- a/adventure/subr.c
+++ b/adventure/subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.c,v 1.6 1998/08/24 22:07:37 hubertf Exp $	*/
+/*	$NetBSD: subr.c,v 1.7 1998/09/13 15:21:37 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subr.c,v 1.6 1998/08/24 22:07:37 hubertf Exp $");
+__RCSID("$NetBSD: subr.c,v 1.7 1998/09/13 15:21:37 hubertf Exp $");
 #endif
 #endif				/* not lint */
 
@@ -474,7 +474,7 @@ trbridge()
 }
 
 
-int
+void
 badmove()
 {				/* 20                   */
 	spk = 12;
@@ -493,10 +493,9 @@ badmove()
 	if (k == 17)
 		spk = 80;
 	rspeak(spk);
-	return (2);
 }
 
-int
+void
 bug(n)
 	int     n;
 {
@@ -505,7 +504,7 @@ bug(n)
 }
 
 
-int
+void
 checkhints()
 {				/* 2600 &c              */
 	int     hint;
@@ -552,7 +551,6 @@ l40010:	hintlc[hint] = 0;
 		hinted[hint] = yes(175, hints[hint][4], 54);
 l40020:	hintlc[hint] = 0;
 	}
-	return 0;
 }
 
 
@@ -1001,7 +999,7 @@ trfill()
 }
 
 
-int
+void
 closing()
 {				/* 10000 */
 	int     i;
@@ -1025,11 +1023,10 @@ closing()
 	rspeak(129);
 	clock1 = -1;
 	closng = TRUE;
-	return (19999);
 }
 
 
-int
+void
 caveclose()
 {				/* 11000 */
 	int     i;
@@ -1058,5 +1055,4 @@ caveclose()
 			dstroy(i);
 	rspeak(132);
 	closed = TRUE;
-	return (2);
 }