Module Name: src
Committed By: dholland
Date: Thu Aug 27 00:36:33 UTC 2009
Modified Files:
src/games/hunt/hunt: playit.c
src/games/hunt/huntd: answer.c faketalk.c
Log Message:
u_int32_t -> uint32_t
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/hunt/hunt/playit.c
cvs rdiff -u -r1.15 -r1.16 src/games/hunt/huntd/answer.c
cvs rdiff -u -r1.17 -r1.18 src/games/hunt/huntd/faketalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hunt/hunt/playit.c
diff -u src/games/hunt/hunt/playit.c:1.15 src/games/hunt/hunt/playit.c:1.16
--- src/games/hunt/hunt/playit.c:1.15 Wed Aug 12 07:42:11 2009
+++ src/games/hunt/hunt/playit.c Thu Aug 27 00:36:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: playit.c,v 1.15 2009/08/12 07:42:11 dholland Exp $ */
+/* $NetBSD: playit.c,v 1.16 2009/08/27 00:36:32 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.15 2009/08/12 07:42:11 dholland Exp $");
+__RCSID("$NetBSD: playit.c,v 1.16 2009/08/27 00:36:32 dholland Exp $");
#endif /* not lint */
#include <sys/file.h>
@@ -89,13 +89,13 @@
{
int ch;
int y, x;
- u_int32_t version;
+ uint32_t version;
if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (u_int32_t)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
@@ -430,13 +430,13 @@
void
do_message(void)
{
- u_int32_t version;
+ uint32_t version;
if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (u_int32_t)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
Index: src/games/hunt/huntd/answer.c
diff -u src/games/hunt/huntd/answer.c:1.15 src/games/hunt/huntd/answer.c:1.16
--- src/games/hunt/huntd/answer.c:1.15 Wed Aug 12 07:42:11 2009
+++ src/games/hunt/huntd/answer.c Thu Aug 27 00:36:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: answer.c,v 1.15 2009/08/12 07:42:11 dholland Exp $ */
+/* $NetBSD: answer.c,v 1.16 2009/08/27 00:36:32 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: answer.c,v 1.15 2009/08/12 07:42:11 dholland Exp $");
+__RCSID("$NetBSD: answer.c,v 1.16 2009/08/27 00:36:32 dholland Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -65,7 +65,7 @@
static SOCKET sockstruct;
char *cp1, *cp2;
int flags;
- u_int32_t version;
+ uint32_t version;
int i;
#ifdef INTERNET
@@ -93,7 +93,7 @@
if (machine == 0)
machine = gethostid();
#endif
- version = htonl((u_int32_t) HUNT_VERSION);
+ version = htonl((uint32_t) HUNT_VERSION);
(void) write(newsock, &version, LONGLEN);
(void) read(newsock, &uid, LONGLEN);
uid = ntohl(uid);
Index: src/games/hunt/huntd/faketalk.c
diff -u src/games/hunt/huntd/faketalk.c:1.17 src/games/hunt/huntd/faketalk.c:1.18
--- src/games/hunt/huntd/faketalk.c:1.17 Sat Jul 4 07:51:35 2009
+++ src/games/hunt/huntd/faketalk.c Thu Aug 27 00:36:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $ */
+/* $NetBSD: faketalk.c,v 1.18 2009/08/27 00:36:33 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: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.18 2009/08/27 00:36:33 dholland Exp $");
#endif /* not lint */
#include "bsd.h"
@@ -220,7 +220,7 @@
msg.ctl_addr = ctl_addr;
msg.ctl_addr.sin_family = htons(msg.ctl_addr.sin_family);
#endif
- msg.id_num = (int) htonl((u_int32_t) -1); /* an impossible id_num */
+ msg.id_num = (int) htonl((uint32_t) -1); /* an impossible id_num */
ctl_transact(his_machine_addr, msg, ANNOUNCE, &response);
if (response.answer != SUCCESS)
return;
