PR/3964: Eric Fischer: Remove dependencies to traditional cpp...

While I was there add WARNS?= too.

1 files changed, 69 insertions, 64 deletions

diff --git a/adventure/save.c b/adventure/save.c
index e748ad2e..75b45184 100644
--- a/adventure/save.c
+++ b/adventure/save.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: save.c,v 1.2 1995/03/21 12:05:08 cgd Exp $	*/
+/*	$NetBSD: save.c,v 1.3 1997/08/11 14:06:17 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -38,16 +38,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: save.c,v 1.2 1995/03/21 12:05:08 cgd Exp $";
+__RCSID("$NetBSD: save.c,v 1.3 1997/08/11 14:06:17 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "hdr.h"
+#include "extern.h"
 
 struct savestruct
 {
@@ -57,70 +60,71 @@ struct savestruct
 
 struct savestruct save_array[] =
 {
-	&abbnum,        sizeof(abbnum),
-	&attack,        sizeof(attack),
-	&blklin,        sizeof(blklin),
-	&bonus,         sizeof(bonus),
-	&chloc,         sizeof(chloc),
-	&chloc2,        sizeof(chloc2),
-	&clock1,        sizeof(clock1),
-	&clock2,        sizeof(clock2),
-	&closed,        sizeof(closed),
-	&closng,        sizeof(closng),
-	&daltlc,        sizeof(daltlc),
-	&demo,          sizeof(demo),
-	&detail,        sizeof(detail),
-	&dflag,         sizeof(dflag),
-	&dkill,         sizeof(dkill),
-	&dtotal,        sizeof(dtotal),
-	&foobar,        sizeof(foobar),
-	&gaveup,        sizeof(gaveup),
-	&holdng,        sizeof(holdng),
-	&iwest,         sizeof(iwest),
-	&k,             sizeof(k),
-	&k2,            sizeof(k2),
-	&knfloc,        sizeof(knfloc),
-	&kq,            sizeof(kq),
-	&latncy,        sizeof(latncy),
-	&limit,         sizeof(limit),
-	&lmwarn,        sizeof(lmwarn),
-	&loc,           sizeof(loc),
-	&maxdie,        sizeof(maxdie),
-	&mxscor,        sizeof(mxscor),
-	&newloc,        sizeof(newloc),
-	&numdie,        sizeof(numdie),
-	&obj,           sizeof(obj),
-	&oldlc2,        sizeof(oldlc2),
-	&oldloc,        sizeof(oldloc),
-	&panic,         sizeof(panic),
-	&saved,         sizeof(saved),
-	&savet,         sizeof(savet),
-	&scorng,        sizeof(scorng),
-	&spk,           sizeof(spk),
-	&stick,         sizeof(stick),
-	&tally,         sizeof(tally),
-	&tally2,        sizeof(tally2),
-	&tkk,           sizeof(tkk),
-	&turns,         sizeof(turns),
-	&verb,          sizeof(verb),
-	&wd1,           sizeof(wd1),
-	&wd2,           sizeof(wd2),
-	&wzdark,        sizeof(wzdark),
-	&yea,           sizeof(yea),
-	atloc,          sizeof(atloc),
-	dloc,           sizeof(dloc),
-	dseen,          sizeof(dseen),
-	fixed,          sizeof(fixed),
-	hinted,         sizeof(hinted),
-	link,           sizeof(link),
-	odloc,          sizeof(odloc),
-	place,          sizeof(place),
-	prop,           sizeof(prop),
-	tk,             sizeof(tk),
+	{ &abbnum,        sizeof(abbnum) },
+	{ &attack,        sizeof(attack) },
+	{ &blklin,        sizeof(blklin) },
+	{ &bonus,         sizeof(bonus) },
+	{ &chloc,         sizeof(chloc) },
+	{ &chloc2,        sizeof(chloc2) },
+	{ &clock1,        sizeof(clock1) },
+	{ &clock2,        sizeof(clock2) },
+	{ &closed,        sizeof(closed) },
+	{ &closng,        sizeof(closng) },
+	{ &daltlc,        sizeof(daltlc) },
+	{ &demo,          sizeof(demo) },
+	{ &detail,        sizeof(detail) },
+	{ &dflag,         sizeof(dflag) },
+	{ &dkill,         sizeof(dkill) },
+	{ &dtotal,        sizeof(dtotal) },
+	{ &foobar,        sizeof(foobar) },
+	{ &gaveup,        sizeof(gaveup) },
+	{ &holdng,        sizeof(holdng) },
+	{ &iwest,         sizeof(iwest) },
+	{ &k,             sizeof(k) },
+	{ &k2,            sizeof(k2) },
+	{ &knfloc,        sizeof(knfloc) },
+	{ &kq,            sizeof(kq) },
+	{ &latncy,        sizeof(latncy) },
+	{ &limit,         sizeof(limit) },
+	{ &lmwarn,        sizeof(lmwarn) },
+	{ &loc,           sizeof(loc) },
+	{ &maxdie,        sizeof(maxdie) },
+	{ &mxscor,        sizeof(mxscor) },
+	{ &newloc,        sizeof(newloc) },
+	{ &numdie,        sizeof(numdie) },
+	{ &obj,           sizeof(obj) },
+	{ &oldlc2,        sizeof(oldlc2) },
+	{ &oldloc,        sizeof(oldloc) },
+	{ &panic,         sizeof(panic) },
+	{ &saved,         sizeof(saved) },
+	{ &savet,         sizeof(savet) },
+	{ &scorng,        sizeof(scorng) },
+	{ &spk,           sizeof(spk) },
+	{ &stick,         sizeof(stick) },
+	{ &tally,         sizeof(tally) },
+	{ &tally2,        sizeof(tally2) },
+	{ &tkk,           sizeof(tkk) },
+	{ &turns,         sizeof(turns) },
+	{ &verb,          sizeof(verb) },
+	{ &wd1,           sizeof(wd1) },
+	{ &wd2,           sizeof(wd2) },
+	{ &wzdark,        sizeof(wzdark) },
+	{ &yea,           sizeof(yea) },
+	{ atloc,          sizeof(atloc) },
+	{ dloc,           sizeof(dloc) },
+	{ dseen,          sizeof(dseen) },
+	{ fixed,          sizeof(fixed) },
+	{ hinted,         sizeof(hinted) },
+	{ links,          sizeof(links) },
+	{ odloc,          sizeof(odloc) },
+	{ place,          sizeof(place) },
+	{ prop,           sizeof(prop) },
+	{ tk,             sizeof(tk) },
 
-	NULL,   0
+	{ NULL,   0 }
 };
 
+int
 save(outfile)   /* Two passes on data: first to get checksum, second */
 char *outfile;  /* to output the data using checksum to start random #s */
 {
@@ -153,13 +157,14 @@ char *outfile;  /* to output the data using checksum to start random #s */
 	return 0;
 }
 
+int
 restore(infile)
 char *infile;
 {
 	FILE *in;
 	struct savestruct *p;
 	char *s;
-	long sum, cksum;
+	long sum, cksum = 0;
 	int i;
 
 	if ((in = fopen(infile, "rb")) == NULL)