Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/games/hunt Additional minor cleanup and remove a straggler d...
details: https://anonhg.NetBSD.org/src/rev/db2dbe44c75b
branches: trunk
changeset: 328252:db2dbe44c75b
user: dholland <dholland%NetBSD.org@localhost>
date: Sat Mar 29 21:55:59 2014 +0000
description:
Additional minor cleanup and remove a straggler data declaration
from hunt_common.h.
diffstat:
games/hunt/huntd/driver.c | 18 +++++++++---------
games/hunt/huntd/extern.c | 12 +++++++-----
games/hunt/huntd/hunt.h | 9 ++++++---
games/hunt/include/hunt_common.h | 3 +--
4 files changed, 23 insertions(+), 19 deletions(-)
diffs (145 lines):
diff -r 79bc826b2f5f -r db2dbe44c75b games/hunt/huntd/driver.c
--- a/games/hunt/huntd/driver.c Sat Mar 29 21:43:46 2014 +0000
+++ b/games/hunt/huntd/driver.c Sat Mar 29 21:55:59 2014 +0000
@@ -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 @@
#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 @@
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 @@
* Exit with the given value, cleaning up any droppings lying around
*/
void
-cleanup(int eval)
+cleanup(int exitval)
{
PLAYER *pp;
@@ -861,7 +861,7 @@
(void) unlink(Sock_name);
#endif
- exit(eval);
+ exit(exitval);
}
/*
diff -r 79bc826b2f5f -r db2dbe44c75b games/hunt/huntd/extern.c
--- a/games/hunt/huntd/extern.c Sat Mar 29 21:43:46 2014 +0000
+++ b/games/hunt/huntd/extern.c Sat Mar 29 21:55:59 2014 +0000
@@ -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 *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 -r 79bc826b2f5f -r db2dbe44c75b games/hunt/huntd/hunt.h
--- a/games/hunt/huntd/hunt.h Sat Mar 29 21:43:46 2014 +0000
+++ b/games/hunt/huntd/hunt.h Sat Mar 29 21:55:59 2014 +0000
@@ -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 -r 79bc826b2f5f -r db2dbe44c75b games/hunt/include/hunt_common.h
--- a/games/hunt/include/hunt_common.h Sat Mar 29 21:43:46 2014 +0000
+++ b/games/hunt/include/hunt_common.h Sat Mar 29 21:55:59 2014 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index