Additional minor cleanup and remove a straggler data declaration

from hunt_common.h.

4 files changed, 23 insertions, 19 deletions

diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index b7dbd2b5..1f37092b 100644
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: driver.c,v 1.29 2014/03/29 21:33:41 dholland Exp $	*/
+/*	$NetBSD: driver.c,v 1.30 2014/03/29 21:55:59 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: driver.c,v 1.29 2014/03/29 21:33:41 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.30 2014/03/29 21:55:59 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -47,7 +47,7 @@ __RCSID("$NetBSD: driver.c,v 1.29 2014/03/29 21:33:41 dholland Exp $");
 
 
 #ifdef INTERNET
-static u_short Test_port = TEST_PORT;
+static uint16_t Test_port = TEST_PORT;
 #else
 static const char Sock_name[] = "/tmp/hunt";
 static const char Stat_name[] = "/tmp/hunt.stats";
@@ -822,11 +822,11 @@ havechar(PLAYER *pp, int i)
 	if (!(fdset[i].revents & POLLIN))
 		return false;
 check_again:
-	errno = 0;
-	if ((pp->p_nchar = read(pp->p_fd, pp->p_cbuf, sizeof pp->p_cbuf)) <= 0)
-	{
+	pp->p_nchar = read(pp->p_fd, pp->p_cbuf, sizeof pp->p_cbuf);
+	if (pp->p_nchar < 0 && errno == EINTR) {
+		goto check_again;
+	} else if (pp->p_nchar <= 0) {
 		if (errno == EINTR)
-			goto check_again;
 		pp->p_cbuf[0] = 'q';
 	}
 	pp->p_ncount = 0;
@@ -838,7 +838,7 @@ check_again:
  *	Exit with the given value, cleaning up any droppings lying around
  */
 void
-cleanup(int eval)
+cleanup(int exitval)
 {
 	PLAYER *pp;
 
@@ -861,7 +861,7 @@ cleanup(int eval)
 	(void) unlink(Sock_name);
 #endif
 
-	exit(eval);
+	exit(exitval);
 }
 
 /*
diff --git a/hunt/huntd/extern.c b/hunt/huntd/extern.c
index 3991849d..0c14090d 100644
--- a/hunt/huntd/extern.c
+++ b/hunt/huntd/extern.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.c,v 1.8 2014/03/29 21:33:41 dholland Exp $	*/
+/*	$NetBSD: extern.c,v 1.9 2014/03/29 21:55:59 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: extern.c,v 1.8 2014/03/29 21:33:41 dholland Exp $");
+__RCSID("$NetBSD: extern.c,v 1.9 2014/03/29 21:55:59 dholland Exp $");
 #endif /* not lint */
 
 #include "hunt.h"
@@ -65,20 +65,22 @@ PLAYER Monitor[MAXMON];			/* all the monitors */
 PLAYER *End_monitor = Monitor;		/* last active monitor slot */
 #endif
 
-int shot_req[MAXBOMB] = {
+const int shot_req[MAXBOMB] = {
 	BULREQ, GRENREQ, SATREQ,
 	BOMB7REQ, BOMB9REQ, BOMB11REQ,
 	BOMB13REQ, BOMB15REQ, BOMB17REQ,
 	BOMB19REQ, BOMB21REQ,
 };
 
-int shot_type[MAXBOMB] = {
+const int shot_type[MAXBOMB] = {
 	SHOT, GRENADE, SATCHEL,
 	BOMB, BOMB, BOMB,
 	BOMB, BOMB, BOMB,
 	BOMB, BOMB,
 };
 
-int slime_req[MAXSLIME] = {
+#ifdef OOZE
+const int slime_req[MAXSLIME] = {
 	SLIMEREQ, SSLIMEREQ, SLIME2REQ, SLIME3REQ,
 };
+#endif
diff --git a/hunt/huntd/hunt.h b/hunt/huntd/hunt.h
index 557884bf..71c33adb 100644
--- a/hunt/huntd/hunt.h
+++ b/hunt/huntd/hunt.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.h,v 1.25 2014/03/29 21:43:46 dholland Exp $	*/
+/*	$NetBSD: hunt.h,v 1.26 2014/03/29 21:55:59 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -55,8 +55,11 @@
 
 #include "hunt_common.h"
 
-extern int shot_req[];
-extern int shot_type[];
+extern const int shot_req[];
+extern const int shot_type[];
+#ifdef OOZE
+extern const int slime_req[];
+#endif
 
 typedef struct bullet_def	BULLET;
 typedef struct expl_def		EXPL;
diff --git a/hunt/include/hunt_common.h b/hunt/include/hunt_common.h
index 31018799..a463cf16 100644
--- a/hunt/include/hunt_common.h
+++ b/hunt/include/hunt_common.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt_common.h,v 1.2 2014/03/29 21:25:35 dholland Exp $	*/
+/*	$NetBSD: hunt_common.h,v 1.3 2014/03/29 21:55:59 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -206,7 +206,6 @@
 #define SLIME3REQ	20
 #define MAXSLIME	4
 #define SLIMESPEED	5
-extern int slime_req[];
 #endif
 #ifdef VOLCANO
 #define LAVASPEED	1