X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/dfce1cca7e9f2a93d3246b5dba2113e20cbc447a..053f2cb3f40dbb587e71b330841d5f4dd6598877:/hack/hack.save.c

diff --git a/hack/hack.save.c b/hack/hack.save.c
index 9a968da4..72722a02 100644
--- a/hack/hack.save.c
+++ b/hack/hack.save.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.save.c,v 1.10 2008/01/28 06:55:42 dholland Exp $	*/
+/*	$NetBSD: hack.save.c,v 1.13 2009/08/12 07:28:41 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.save.c,v 1.10 2008/01/28 06:55:42 dholland Exp $");
+__RCSID("$NetBSD: hack.save.c,v 1.13 2009/08/12 07:28:41 dholland Exp $");
 #endif				/* not lint */
 
 #include <signal.h>
@@ -73,9 +73,10 @@ __RCSID("$NetBSD: hack.save.c,v 1.10 2008/01/28 06:55:42 dholland Exp $");
 #include "hack.h"
 #include "extern.h"
 
+static int dosave0(int);
 
 int
-dosave()
+dosave(void)
 {
 	if (dosave0(0)) {
 		settty("Be seeing you ...\n");
@@ -86,8 +87,7 @@ dosave()
 
 #ifndef NOSAVEONHANGUP
 void
-hangup(n)
-	int n __unused;
+hangup(int n __unused)
 {
 	(void) dosave0(1);
 	exit(1);
@@ -95,9 +95,8 @@ hangup(n)
 #endif	/* NOSAVEONHANGUP */
 
 /* returns 1 if save successful */
-int
-dosave0(hu)
-	int             hu;
+static int
+dosave0(int hu)
 {
 	int		fd, ofd;
 	int             tmp;	/* not ! */
@@ -117,17 +116,17 @@ dosave0(hu)
 	saveobjchn(fd, fcobj);
 	savemonchn(fd, fallen_down);
 	tmp = getuid();
-	bwrite(fd, (char *) &tmp, sizeof tmp);
-	bwrite(fd, (char *) &flags, sizeof(struct flag));
-	bwrite(fd, (char *) &dlevel, sizeof dlevel);
-	bwrite(fd, (char *) &maxdlevel, sizeof maxdlevel);
-	bwrite(fd, (char *) &moves, sizeof moves);
-	bwrite(fd, (char *) &u, sizeof(struct you));
+	bwrite(fd, &tmp, sizeof tmp);
+	bwrite(fd, &flags, sizeof(struct flag));
+	bwrite(fd, &dlevel, sizeof dlevel);
+	bwrite(fd, &maxdlevel, sizeof maxdlevel);
+	bwrite(fd, &moves, sizeof moves);
+	bwrite(fd, &u, sizeof(struct you));
 	if (u.ustuck)
-		bwrite(fd, (char *) &(u.ustuck->m_id), sizeof u.ustuck->m_id);
-	bwrite(fd, (char *) pl_character, sizeof pl_character);
-	bwrite(fd, (char *) genocided, sizeof genocided);
-	bwrite(fd, (char *) fut_geno, sizeof fut_geno);
+		bwrite(fd, &(u.ustuck->m_id), sizeof u.ustuck->m_id);
+	bwrite(fd, pl_character, sizeof pl_character);
+	bwrite(fd, genocided, sizeof genocided);
+	bwrite(fd, fut_geno, sizeof fut_geno);
 	savenames(fd);
 	for (tmp = 1; tmp <= maxdlevel; tmp++) {
 
@@ -145,7 +144,7 @@ dosave0(hu)
 		}
 		getlev(ofd, hackpid, tmp);
 		(void) close(ofd);
-		bwrite(fd, (char *) &tmp, sizeof tmp);	/* level number */
+		bwrite(fd, &tmp, sizeof tmp);	/* level number */
 		savelev(fd, tmp);	/* actual level */
 		(void) unlink(lock);
 	}
@@ -158,8 +157,7 @@ dosave0(hu)
 }
 
 int
-dorecover(fd)
-	int fd;
+dorecover(int fd)
 {
 	int nfd;
 	int             tmp;	/* not a ! */
@@ -243,8 +241,7 @@ monfnd:
 }
 
 struct obj     *
-restobjchn(fd)
-	int fd;
+restobjchn(int fd)
 {
 	struct obj     *otmp, *otmp2 = NULL;
 	struct obj     *first = 0;
@@ -271,8 +268,7 @@ restobjchn(fd)
 }
 
 struct monst   *
-restmonchn(fd)
-	int fd;
+restmonchn(int fd)
 {
 	struct monst   *mtmp, *mtmp2 = NULL;
 	struct monst   *first = 0;