summaryrefslogtreecommitdiffstats
path: root/hunt
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2009-07-04 01:23:55 +0000
committerdholland <dholland@NetBSD.org>2009-07-04 01:23:55 +0000
commit2ed72a1bcf581a5fd6c51e303cabc53eea8de596 (patch)
tree4f9b869117c6f8df50f620e51311650f241eec01 /hunt
parentb4927eeb3c0ce78e92584e8f5c602101445e1cc4 (diff)
downloadbsdgames-darwin-2ed72a1bcf581a5fd6c51e303cabc53eea8de596.tar.gz
bsdgames-darwin-2ed72a1bcf581a5fd6c51e303cabc53eea8de596.tar.zst
bsdgames-darwin-2ed72a1bcf581a5fd6c51e303cabc53eea8de596.zip
Remove bogus casts. Two object file diffs inspected and found to be harmless.
Diffstat (limited to 'hunt')
-rw-r--r--hunt/hunt/connect.c10
-rw-r--r--hunt/hunt/hunt.c21
-rw-r--r--hunt/hunt/playit.c8
3 files changed, 19 insertions, 20 deletions
diff --git a/hunt/hunt/connect.c b/hunt/hunt/connect.c
index 5275dbf8..faead11b 100644
--- a/hunt/hunt/connect.c
+++ b/hunt/hunt/connect.c
@@ -1,4 +1,4 @@
-/* $NetBSD: connect.c,v 1.5 2003/06/11 12:00:21 wiz Exp $ */
+/* $NetBSD: connect.c,v 1.6 2009/07/04 01:23:55 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: connect.c,v 1.5 2003/06/11 12:00:21 wiz Exp $");
+__RCSID("$NetBSD: connect.c,v 1.6 2009/07/04 01:23:55 dholland Exp $");
#endif /* not lint */
# include "hunt.h"
@@ -50,11 +50,11 @@ do_connect(name, team, enter_status)
if (uid == 0)
uid = htonl(getuid());
- (void) write(Socket, (char *) &uid, LONGLEN);
+ (void) write(Socket, &uid, LONGLEN);
(void) write(Socket, name, NAMELEN);
(void) write(Socket, &team, 1);
enter_status = htonl(enter_status);
- (void) write(Socket, (char *) &enter_status, LONGLEN);
+ (void) write(Socket, &enter_status, LONGLEN);
(void) strcpy(Buf, ttyname(fileno(stderr)));
(void) write(Socket, Buf, NAMELEN);
# ifdef INTERNET
@@ -69,5 +69,5 @@ do_connect(name, team, enter_status)
# endif
mode = C_PLAYER;
mode = htonl(mode);
- (void) write(Socket, (char *) &mode, sizeof mode);
+ (void) write(Socket, &mode, sizeof mode);
}
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 566fe40e..24abdb5d 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hunt.c,v 1.28 2009/06/28 21:12:10 dholland Exp $ */
+/* $NetBSD: hunt.c,v 1.29 2009/07/04 01:23:55 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: hunt.c,v 1.28 2009/06/28 21:12:10 dholland Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.29 2009/07/04 01:23:55 dholland Exp $");
#endif /* not lint */
# include <sys/param.h>
@@ -365,7 +365,7 @@ main(ac, av)
if ((enter_status = quit(enter_status)) == Q_QUIT)
break;
}
- leavex(0, (char *) NULL);
+ leavex(0, NULL);
/* NOTREACHED */
return(0);
}
@@ -473,7 +473,7 @@ list_drivers()
/* favor host of previous session by broadcasting to it first */
test.sin_addr = Daemon.sin_addr;
msg = htons(C_PLAYER); /* Must be playing! */
- (void) sendto(test_socket, (char *) &msg, sizeof msg, 0,
+ (void) sendto(test_socket, &msg, sizeof msg, 0,
(struct sockaddr *) &test, DAEMON_SIZE);
}
@@ -515,7 +515,7 @@ list_drivers()
while (hp = gethostent()) {
if (local_net == inet_netof(* ((struct in_addr *) hp->h_addr))){
test.sin_addr = * ((struct in_addr *) hp->h_addr);
- (void) sendto(test_socket, (char *) &msg, sizeof msg, 0,
+ (void) sendto(test_socket, &msg, sizeof msg, 0,
(struct sockaddr *) &test, DAEMON_SIZE);
}
}
@@ -529,12 +529,11 @@ get_response:
for (;;) {
if (listc + 1 >= listmax) {
listmax += 20;
- listv = (SOCKET *) realloc((char *) listv,
- listmax * sizeof(SOCKET));
+ listv = realloc(listv, listmax * sizeof(SOCKET));
}
if (poll(set, 1, 1000) == 1 &&
- recvfrom(test_socket, (char *) &port_num, sizeof(port_num),
+ recvfrom(test_socket, &port_num, sizeof(port_num),
0, (struct sockaddr *) &listv[listc], &namelen) > 0) {
/*
* Note that we do *not* convert from network to host
@@ -567,7 +566,7 @@ get_response:
test_one_host:
msg = htons(C_TESTMSG());
- (void) sendto(test_socket, (char *) &msg, sizeof msg, 0,
+ (void) sendto(test_socket, &msg, sizeof msg, 0,
(struct sockaddr *) &test, DAEMON_SIZE);
goto get_response;
}
@@ -757,7 +756,7 @@ SIGNAL_TYPE
sigterm(dummy)
int dummy __unused;
{
- leavex(0, (char *) NULL);
+ leavex(0, NULL);
/* NOTREACHED */
}
@@ -838,7 +837,7 @@ intr(dummy)
(void) write(Socket, "q", 1);
(void) close(Socket);
}
- leavex(0, (char *) NULL);
+ leavex(0, NULL);
}
else if (ch == 'n') {
(void) signal(SIGINT, intr);
diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c
index 815fbcba..7583e334 100644
--- a/hunt/hunt/playit.c
+++ b/hunt/hunt/playit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: playit.c,v 1.9 2008/01/28 03:23:29 dholland Exp $ */
+/* $NetBSD: playit.c,v 1.10 2009/07/04 01:23:55 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: playit.c,v 1.9 2008/01/28 03:23:29 dholland Exp $");
+__RCSID("$NetBSD: playit.c,v 1.10 2009/07/04 01:23:55 dholland Exp $");
#endif /* not lint */
# include <sys/file.h>
@@ -109,7 +109,7 @@ playit()
int y, x;
u_int32_t version;
- if (read(Socket, (char *) &version, LONGLEN) != LONGLEN) {
+ if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}
@@ -644,7 +644,7 @@ do_message()
{
u_int32_t version;
- if (read(Socket, (char *) &version, LONGLEN) != LONGLEN) {
+ if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}