X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/bbaddd455190c6e1fff13f67b55db4bc5018a05a..bcbc46f191b73fe1b817d448571b248466e49272:/hack/hack.o_init.c?ds=sidebyside

diff --git a/hack/hack.o_init.c b/hack/hack.o_init.c
index 1f99752e..9ca796e2 100644
--- a/hack/hack.o_init.c
+++ b/hack/hack.o_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.o_init.c,v 1.8 2009/01/18 00:34:03 lukem Exp $	*/
+/*	$NetBSD: hack.o_init.c,v 1.14 2011/08/06 20:42:43 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.o_init.c,v 1.8 2009/01/18 00:34:03 lukem Exp $");
+__RCSID("$NetBSD: hack.o_init.c,v 1.14 2011/08/06 20:42:43 dholland Exp $");
 #endif				/* not lint */
 
 #include <string.h>
@@ -72,9 +72,11 @@ __RCSID("$NetBSD: hack.o_init.c,v 1.8 2009/01/18 00:34:03 lukem Exp $");
 #include "def.objects.h"
 #include "hack.onames.h"	/* for LAST_GEM */
 
+static void setgemprobs(void);
+static int interesting_to_discover(int);
+
 int
-letindex(let)
-	char            let;
+letindex(int let)
 {
 	int             i = 0;
 	char            ch;
@@ -85,7 +87,7 @@ letindex(let)
 }
 
 void
-init_objects()
+init_objects(void)
 {
 	int             i, j, first, last, sum, end;
 	char            let;
@@ -138,8 +140,7 @@ check:
 }
 
 int
-probtype(let)
-	char            let;
+probtype(int let)
 {
 	int             i = bases[letindex(let)];
 	int             prob = rn2(100);
@@ -150,8 +151,8 @@ probtype(let)
 	return (i);
 }
 
-void
-setgemprobs()
+static void
+setgemprobs(void)
 {
 	int             j, first;
 
@@ -170,19 +171,18 @@ setgemprobs()
 }
 
 void
-oinit()
+oinit(void)
 {				/* level dependent initialization */
 	setgemprobs();
 }
 
 void
-savenames(fd)
-	int             fd;
+savenames(int fd)
 {
 	int             i;
 	size_t          len;
-	bwrite(fd, (char *) bases, sizeof bases);
-	bwrite(fd, (char *) objects, sizeof objects);
+	bwrite(fd, bases, sizeof bases);
+	bwrite(fd, objects, sizeof objects);
 	/*
 	 * as long as we use only one version of Hack/Quest we need not save
 	 * oc_name and oc_descr, but we must save oc_uname for all objects
@@ -190,30 +190,29 @@ savenames(fd)
 	for (i = 0; i < SIZE(objects); i++) {
 		if (objects[i].oc_uname) {
 			len = strlen(objects[i].oc_uname) + 1;
-			bwrite(fd, (char *) &len, sizeof len);
+			bwrite(fd, &len, sizeof len);
 			bwrite(fd, objects[i].oc_uname, len);
 		}
 	}
 }
 
 void
-restnames(fd)
-	int             fd;
+restnames(int fd)
 {
 	int             i;
 	unsigned        len;
-	mread(fd, (char *) bases, sizeof bases);
-	mread(fd, (char *) objects, sizeof objects);
+	mread(fd, bases, sizeof bases);
+	mread(fd, objects, sizeof objects);
 	for (i = 0; i < SIZE(objects); i++)
 		if (objects[i].oc_uname) {
-			mread(fd, (char *) &len, sizeof len);
-			objects[i].oc_uname = (char *) alloc(len);
+			mread(fd, &len, sizeof len);
+			objects[i].oc_uname = alloc(len);
 			mread(fd, objects[i].oc_uname, len);
 		}
 }
 
 int
-dodiscovered()
+dodiscovered(void)
 {				/* free after Robert Viduya */
 	int             i, end;
 	int             ct = 0;
@@ -229,16 +228,15 @@ dodiscovered()
 	}
 	if (ct == 0) {
 		pline("You haven't discovered anything yet...");
-		cornline(3, (char *) 0);
+		cornline(3, NULL);
 	} else
-		cornline(2, (char *) 0);
+		cornline(2, NULL);
 
 	return (0);
 }
 
-int
-interesting_to_discover(i)
-	int             i;
+static int
+interesting_to_discover(int i)
 {
 	return (
 		objects[i].oc_uname != NULL ||