NULL does not need a cast

4 files changed, 17 insertions, 18 deletions

diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 5c7e19fc..30bdb55a 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.c,v 1.39 2011/05/23 22:56:11 joerg Exp $	*/
+/*	$NetBSD: hunt.c,v 1.40 2011/08/31 16:24:56 plunky 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: hunt.c,v 1.39 2011/05/23 22:56:11 joerg Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.40 2011/08/31 16:24:56 plunky Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -624,10 +624,10 @@ start_driver(void)
 #else
 		if (use_port == NULL)
 #endif
-			execl(Driver, "HUNT", (char *) NULL);
+			execl(Driver, "HUNT", NULL);
 #ifdef INTERNET
 		else
-			execl(Driver, "HUNT", "-p", use_port, (char *) NULL);
+			execl(Driver, "HUNT", "-p", use_port, NULL);
 #endif
 		/* only get here if exec failed */
 		(void) kill(getppid(), SIGUSR1);	/* tell mom */
diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c
index 0abf364a..23096d77 100644
--- a/hunt/huntd/driver.c
+++ b/hunt/huntd/driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: driver.c,v 1.20 2009/08/12 07:42:11 dholland Exp $	*/
+/*	$NetBSD: driver.c,v 1.21 2011/08/31 16:24:56 plunky 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.20 2009/08/12 07:42:11 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.21 2011/08/31 16:24:56 plunky Exp $");
 #endif /* not lint */
 
 #include <sys/ioctl.h>
@@ -412,7 +412,7 @@ init(void)
 	fdset[2].fd = -1;
 #endif
 
-	Seed = getpid() + time((time_t *) NULL);
+	Seed = getpid() + time(NULL);
 	makemaze();
 #ifdef BOOTS
 	makeboots();
@@ -662,7 +662,7 @@ zap(PLAYER *pp, FLAG was_player, int i)
 		}
 		if (x > 0) {
 			(void) add_shot(len, pp->p_y, pp->p_x, pp->p_face, x,
-				(PLAYER *) NULL, TRUE, SPACE);
+				NULL, TRUE, SPACE);
 			(void) snprintf(Buf, sizeof(Buf), "%s detonated.",
 				pp->p_ident->i_name);
 			for (np = Player; np < End_player; np++)
@@ -710,7 +710,7 @@ zap(PLAYER *pp, FLAG was_player, int i)
 				y = rand_num(HEIGHT / 2) + HEIGHT / 4;
 			} while (Maze[y][x] != SPACE);
 			(void) add_shot(LAVA, y, x, LEFTS, volcano,
-				(PLAYER *) NULL, TRUE, SPACE);
+				NULL, TRUE, SPACE);
 			for (np = Player; np < End_player; np++)
 				message(np, "Volcano eruption.");
 			volcano = 0;
@@ -726,7 +726,7 @@ zap(PLAYER *pp, FLAG was_player, int i)
 			add_shot(DSHOT, y, x, rand_dir(),
 				shot_req[MINDSHOT +
 				rand_num(MAXBOMB - MINDSHOT)],
-				(PLAYER *) NULL, FALSE, SPACE);
+				NULL, FALSE, SPACE);
 		}
 #endif
 
diff --git a/hunt/huntd/execute.c b/hunt/huntd/execute.c
index a99cccd4..e3e5ba2b 100644
--- a/hunt/huntd/execute.c
+++ b/hunt/huntd/execute.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: execute.c,v 1.9 2009/07/04 04:29:54 dholland Exp $	*/
+/*	$NetBSD: execute.c,v 1.10 2011/08/31 16:24:56 plunky 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: execute.c,v 1.9 2009/07/04 04:29:54 dholland Exp $");
+__RCSID("$NetBSD: execute.c,v 1.10 2011/08/31 16:24:56 plunky Exp $");
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -566,8 +566,7 @@ pickup(PLAYER *pp, int y, int x, int prob, int obj)
 		abort();
 	}
 	if (rand_num(100) < prob)
-		add_shot(obj, y, x, LEFTS, req, (PLAYER *) NULL,
-			TRUE, pp->p_face);
+		add_shot(obj, y, x, LEFTS, req, NULL, TRUE, pp->p_face);
 	else {
 		pp->p_ammo += req;
 		(void) snprintf(Buf, sizeof(Buf), "%3d", pp->p_ammo);
diff --git a/hunt/huntd/shots.c b/hunt/huntd/shots.c
index ad655e2e..7a5192fc 100644
--- a/hunt/huntd/shots.c
+++ b/hunt/huntd/shots.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shots.c,v 1.11 2009/07/04 06:19:05 dholland Exp $	*/
+/*	$NetBSD: shots.c,v 1.12 2011/08/31 16:24:56 plunky 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: shots.c,v 1.11 2009/07/04 06:19:05 dholland Exp $");
+__RCSID("$NetBSD: shots.c,v 1.12 2011/08/31 16:24:56 plunky Exp $");
 #endif /* not lint */
 
 #include <err.h>
@@ -631,7 +631,7 @@ again:
 #ifdef BOOTS
 		if (pp->p_face != BOOT && pp->p_face != BOOT_PAIR) {
 #endif
-			checkdam(pp, (PLAYER *) NULL, (IDENT *) NULL,
+			checkdam(pp, NULL, NULL,
 				rand_num(pp->p_damage / 5), FALL);
 			pp->p_face = rand_dir();
 			showstat(pp);
@@ -732,7 +732,7 @@ chkshot(BULLET *bp, BULLET *next)
 					y, x, LEFTS,
 					(Maze[y][x] == GMINE) ?
 					GRENREQ : BULREQ,
-					(PLAYER *) NULL, TRUE, SPACE);
+					NULL, TRUE, SPACE);
 				Maze[y][x] = SPACE;
 				break;
 			}