WARNsify...

1 files changed, 118 insertions, 104 deletions

diff --git a/hack/hack.save.c b/hack/hack.save.c
index 3e7a2543..26386e70 100644
--- a/hack/hack.save.c
+++ b/hack/hack.save.c
@@ -1,54 +1,61 @@
+/*	$NetBSD: hack.save.c,v 1.6 1997/10/19 16:58:57 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.save.c,v 1.5 1995/03/23 08:31:27 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.save.c,v 1.6 1997/10/19 16:58:57 christos Exp $");
+#endif				/* not lint */
 
-#include "hack.h"
-extern char genocided[60];	/* defined in Decl.c */
-extern char fut_geno[60];	/* idem */
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include "hack.h"
+#include "extern.h"
 
-extern char SAVEF[], nul[];
-extern char pl_character[PL_CSIZ];
-extern struct obj *restobjchn();
-extern struct monst *restmonchn();
 
-dosave(){
-	if(dosave0(0)) {
+int
+dosave()
+{
+	if (dosave0(0)) {
 		settty("Be seeing you ...\n");
 		exit(0);
 	}
-#ifdef lint
-	return(0);
-#endif lint
+	return (0);
 }
 
 #ifndef NOSAVEONHANGUP
-hangup(){
+void
+hangup(n)
+	int n;
+{
 	(void) dosave0(1);
 	exit(1);
 }
-#endif NOSAVEONHANGUP
+#endif	/* NOSAVEONHANGUP */
 
 /* returns 1 if save successful */
-dosave0(hu) int hu; {
-	register fd, ofd;
-	int tmp;		/* not register ! */
+int
+dosave0(hu)
+	int             hu;
+{
+	int		fd, ofd;
+	int             tmp;	/* not ! */
 
 	(void) signal(SIGHUP, SIG_IGN);
 	(void) signal(SIGINT, SIG_IGN);
-	if((fd = creat(SAVEF, FMASK)) < 0) {
-		if(!hu) pline("Cannot open save file. (Continue or Quit)");
-		(void) unlink(SAVEF);		/* ab@unido */
-		return(0);
+	if ((fd = creat(SAVEF, FMASK)) < 0) {
+		if (!hu)
+			pline("Cannot open save file. (Continue or Quit)");
+		(void) unlink(SAVEF);	/* ab@unido */
+		return (0);
 	}
-	if(flags.moonphase == FULL_MOON)	/* ut-sally!fletcher */
-		u.uluck--;			/* and unido!ab */
-	savelev(fd,dlevel);
+	if (flags.moonphase == FULL_MOON)	/* ut-sally!fletcher */
+		u.uluck--;	/* and unido!ab */
+	savelev(fd, dlevel);
 	saveobjchn(fd, invent);
 	saveobjchn(fd, fcobj);
 	savemonchn(fd, fallen_down);
@@ -59,29 +66,30 @@ dosave0(hu) int hu; {
 	bwrite(fd, (char *) &maxdlevel, sizeof maxdlevel);
 	bwrite(fd, (char *) &moves, sizeof moves);
 	bwrite(fd, (char *) &u, sizeof(struct you));
-	if(u.ustuck)
+	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);
 	savenames(fd);
-	for(tmp = 1; tmp <= maxdlevel; tmp++) {
-		extern int hackpid;
-		extern boolean level_exists[];
+	for (tmp = 1; tmp <= maxdlevel; tmp++) {
 
-		if(tmp == dlevel || !level_exists[tmp]) continue;
+		if (tmp == dlevel || !level_exists[tmp])
+			continue;
 		glo(tmp);
-		if((ofd = open(lock, 0)) < 0) {
-		    if(!hu) pline("Error while saving: cannot read %s.", lock);
-		    (void) close(fd);
-		    (void) unlink(SAVEF);
-		    if(!hu) done("tricked");
-		    return(0);
+		if ((ofd = open(lock, 0)) < 0) {
+			if (!hu)
+				pline("Error while saving: cannot read %s.", lock);
+			(void) close(fd);
+			(void) unlink(SAVEF);
+			if (!hu)
+				done("tricked");
+			return (0);
 		}
 		getlev(ofd, hackpid, tmp);
 		(void) close(ofd);
 		bwrite(fd, (char *) &tmp, sizeof tmp);	/* level number */
-		savelev(fd,tmp);			/* actual level */
+		savelev(fd, tmp);	/* actual level */
 		(void) unlink(lock);
 	}
 	(void) close(fd);
@@ -89,155 +97,161 @@ dosave0(hu) int hu; {
 	(void) unlink(lock);	/* get rid of current level --jgm */
 	glo(0);
 	(void) unlink(lock);
-	return(1);
+	return (1);
 }
 
+int
 dorecover(fd)
-register fd;
+	int fd;
 {
-	register nfd;
-	int tmp;		/* not a register ! */
-	unsigned mid;		/* idem */
-	struct obj *otmp;
-	extern boolean restoring;
+	int nfd;
+	int             tmp;	/* not a ! */
+	unsigned        mid;	/* idem */
+	struct obj     *otmp;
 
 	restoring = TRUE;
 	getlev(fd, 0, 0);
 	invent = restobjchn(fd);
-	for(otmp = invent; otmp; otmp = otmp->nobj)
-		if(otmp->owornmask)
+	for (otmp = invent; otmp; otmp = otmp->nobj)
+		if (otmp->owornmask)
 			setworn(otmp, otmp->owornmask);
 	fcobj = restobjchn(fd);
 	fallen_down = restmonchn(fd);
 	mread(fd, (char *) &tmp, sizeof tmp);
-	if(tmp != getuid()) {		/* strange ... */
+	if (tmp != getuid()) {	/* strange ... */
 		(void) close(fd);
 		(void) unlink(SAVEF);
 		puts("Saved game was not yours.");
 		restoring = FALSE;
-		return(0);
+		return (0);
 	}
 	mread(fd, (char *) &flags, sizeof(struct flag));
 	mread(fd, (char *) &dlevel, sizeof dlevel);
 	mread(fd, (char *) &maxdlevel, sizeof maxdlevel);
 	mread(fd, (char *) &moves, sizeof moves);
 	mread(fd, (char *) &u, sizeof(struct you));
-	if(u.ustuck)
+	if (u.ustuck)
 		mread(fd, (char *) &mid, sizeof mid);
 	mread(fd, (char *) pl_character, sizeof pl_character);
 	mread(fd, (char *) genocided, sizeof genocided);
 	mread(fd, (char *) fut_geno, sizeof fut_geno);
 	restnames(fd);
-	while(1) {
-		if(read(fd, (char *) &tmp, sizeof tmp) != sizeof tmp)
+	while (1) {
+		if (read(fd, (char *) &tmp, sizeof tmp) != sizeof tmp)
 			break;
 		getlev(fd, 0, tmp);
 		glo(tmp);
-		if((nfd = creat(lock, FMASK)) < 0)
+		if ((nfd = creat(lock, FMASK)) < 0)
 			panic("Cannot open temp file %s!\n", lock);
-		savelev(nfd,tmp);
+		savelev(nfd, tmp);
 		(void) close(nfd);
 	}
-	(void) lseek(fd, (off_t)0, 0);
+	(void) lseek(fd, (off_t) 0, 0);
 	getlev(fd, 0, 0);
 	(void) close(fd);
 	(void) unlink(SAVEF);
-	if(Punished) {
-		for(otmp = fobj; otmp; otmp = otmp->nobj)
-			if(otmp->olet == CHAIN_SYM) goto chainfnd;
+	if (Punished) {
+		for (otmp = fobj; otmp; otmp = otmp->nobj)
+			if (otmp->olet == CHAIN_SYM)
+				goto chainfnd;
 		panic("Cannot find the iron chain?");
-	chainfnd:
+chainfnd:
 		uchain = otmp;
-		if(!uball){
-			for(otmp = fobj; otmp; otmp = otmp->nobj)
-				if(otmp->olet == BALL_SYM && otmp->spe)
+		if (!uball) {
+			for (otmp = fobj; otmp; otmp = otmp->nobj)
+				if (otmp->olet == BALL_SYM && otmp->spe)
 					goto ballfnd;
 			panic("Cannot find the iron ball?");
-		ballfnd:
+	ballfnd:
 			uball = otmp;
 		}
 	}
-	if(u.ustuck) {
-		register struct monst *mtmp;
+	if (u.ustuck) {
+		struct monst   *mtmp;
 
-		for(mtmp = fmon; mtmp; mtmp = mtmp->nmon)
-			if(mtmp->m_id == mid) goto monfnd;
+		for (mtmp = fmon; mtmp; mtmp = mtmp->nmon)
+			if (mtmp->m_id == mid)
+				goto monfnd;
 		panic("Cannot find the monster ustuck.");
-	monfnd:
+monfnd:
 		u.ustuck = mtmp;
 	}
 #ifndef QUEST
-	setsee();  /* only to recompute seelx etc. - these weren't saved */
-#endif QUEST
+	setsee();		/* only to recompute seelx etc. - these
+				 * weren't saved */
+#endif	/* QUEST */
 	docrt();
 	restoring = FALSE;
-	return(1);
+	return (1);
 }
 
-struct obj *
+struct obj     *
 restobjchn(fd)
-register fd;
+	int fd;
 {
-	register struct obj *otmp, *otmp2;
-	register struct obj *first = 0;
-	int xl;
-#ifdef lint
-	/* suppress "used before set" warning from lint */
-	otmp2 = 0;
-#endif lint
-	while(1) {
+	struct obj     *otmp, *otmp2 = NULL;
+	struct obj     *first = 0;
+	int             xl;
+	while (1) {
 		mread(fd, (char *) &xl, sizeof(xl));
-		if(xl == -1) break;
+		if (xl == -1)
+			break;
 		otmp = newobj(xl);
-		if(!first) first = otmp;
-		else otmp2->nobj = otmp;
+		if (!first)
+			first = otmp;
+		else
+			otmp2->nobj = otmp;
 		mread(fd, (char *) otmp, (unsigned) xl + sizeof(struct obj));
-		if(!otmp->o_id) otmp->o_id = flags.ident++;
+		if (!otmp->o_id)
+			otmp->o_id = flags.ident++;
 		otmp2 = otmp;
 	}
-	if(first && otmp2->nobj){
+	if (first && otmp2->nobj) {
 		impossible("Restobjchn: error reading objchn.");
 		otmp2->nobj = 0;
 	}
-	return(first);
+	return (first);
 }
 
-struct monst *
+struct monst   *
 restmonchn(fd)
-register fd;
+	int fd;
 {
-	register struct monst *mtmp, *mtmp2;
-	register struct monst *first = 0;
-	int xl;
+	struct monst   *mtmp, *mtmp2 = NULL;
+	struct monst   *first = 0;
+	int             xl;
 
 	struct permonst *monbegin;
-	long differ;
+	long            differ;
 
-	mread(fd, (char *)&monbegin, sizeof(monbegin));
-	differ = (char *)(&mons[0]) - (char *)(monbegin);
+	mread(fd, (char *) &monbegin, sizeof(monbegin));
+	differ = (char *) (&mons[0]) - (char *) (monbegin);
 
 #ifdef lint
 	/* suppress "used before set" warning from lint */
 	mtmp2 = 0;
-#endif lint
-	while(1) {
+#endif	/* lint */
+	while (1) {
 		mread(fd, (char *) &xl, sizeof(xl));
-		if(xl == -1) break;
+		if (xl == -1)
+			break;
 		mtmp = newmonst(xl);
-		if(!first) first = mtmp;
-		else mtmp2->nmon = mtmp;
+		if (!first)
+			first = mtmp;
+		else
+			mtmp2->nmon = mtmp;
 		mread(fd, (char *) mtmp, (unsigned) xl + sizeof(struct monst));
-		if(!mtmp->m_id)
+		if (!mtmp->m_id)
 			mtmp->m_id = flags.ident++;
 		mtmp->data = (struct permonst *)
 			((char *) mtmp->data + differ);
-		if(mtmp->minvent)
+		if (mtmp->minvent)
 			mtmp->minvent = restobjchn(fd);
 		mtmp2 = mtmp;
 	}
-	if(first && mtmp2->nmon){
+	if (first && mtmp2->nmon) {
 		impossible("Restmonchn: error reading monchn.");
 		mtmp2->nmon = 0;
 	}
-	return(first);
+	return (first);
 }