WARNsify...

1 files changed, 63 insertions, 38 deletions

diff --git a/hack/hack.rumors.c b/hack/hack.rumors.c
index 0ace09e2..f56e95b3 100644
--- a/hack/hack.rumors.c
+++ b/hack/hack.rumors.c
@@ -1,68 +1,93 @@
+/*	$NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.rumors.c,v 1.3 1995/03/23 08:31:24 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $");
+#endif				/* not lint */
 
-#include	<stdio.h>
-#include	"hack.h"		/* for RUMORFILE and BSD (index) */
-#define	CHARSZ	8			/* number of bits in a char */
-extern long *alloc();
-extern char *index();
-int n_rumors = 0;
-int n_used_rumors = -1;
-char *usedbits;
+#include "hack.h"	/* for RUMORFILE and BSD (strchr) */
+#include "extern.h"
+#define	CHARSZ	8		/* number of bits in a char */
+int             n_rumors = 0;
+int             n_used_rumors = -1;
+char           *usedbits;
 
-init_rumors(rumf) register FILE *rumf; {
-register int i;
+void
+init_rumors(rumf)
+	FILE           *rumf;
+{
+	int             i;
 	n_used_rumors = 0;
-	while(skipline(rumf)) n_rumors++;
+	while (skipline(rumf))
+		n_rumors++;
 	rewind(rumf);
-	i = n_rumors/CHARSZ;
-	usedbits = (char *) alloc((unsigned)(i+1));
-	for( ; i>=0; i--) usedbits[i] = 0;
+	i = n_rumors / CHARSZ;
+	usedbits = (char *) alloc((unsigned) (i + 1));
+	for (; i >= 0; i--)
+		usedbits[i] = 0;
 }
 
-skipline(rumf) register FILE *rumf; {
-char line[COLNO];
-	while(1) {
-		if(!fgets(line, sizeof(line), rumf)) return(0);
-		if(index(line, '\n')) return(1);
+int
+skipline(rumf)
+	FILE           *rumf;
+{
+	char            line[COLNO];
+	while (1) {
+		if (!fgets(line, sizeof(line), rumf))
+			return (0);
+		if (strchr(line, '\n'))
+			return (1);
 	}
 }
 
-outline(rumf) register FILE *rumf; {
-char line[COLNO];
-register char *ep;
-	if(!fgets(line, sizeof(line), rumf)) return;
-	if((ep = index(line, '\n')) != 0) *ep = 0;
+void
+outline(rumf)
+	FILE           *rumf;
+{
+	char            line[COLNO];
+	char           *ep;
+	if (!fgets(line, sizeof(line), rumf))
+		return;
+	if ((ep = strchr(line, '\n')) != 0)
+		*ep = 0;
 	pline("This cookie has a scrap of paper inside! It reads: ");
 	pline(line);
 }
 
-outrumor(){
-register int rn,i;
-register FILE *rumf;
-	if(n_rumors <= n_used_rumors ||
-	  (rumf = fopen(RUMORFILE, "r")) == (FILE *) 0) return;
-	if(n_used_rumors < 0) init_rumors(rumf);
-	if(!n_rumors) goto none;
+void
+outrumor()
+{
+	int             rn, i;
+	FILE           *rumf;
+	if (n_rumors <= n_used_rumors ||
+	    (rumf = fopen(RUMORFILE, "r")) == (FILE *) 0)
+		return;
+	if (n_used_rumors < 0)
+		init_rumors(rumf);
+	if (!n_rumors)
+		goto none;
 	rn = rn2(n_rumors - n_used_rumors);
 	i = 0;
-	while(rn || used(i)) {
+	while (rn || used(i)) {
 		(void) skipline(rumf);
-		if(!used(i)) rn--;
+		if (!used(i))
+			rn--;
 		i++;
 	}
-	usedbits[i/CHARSZ] |= (1 << (i % CHARSZ));
+	usedbits[i / CHARSZ] |= (1 << (i % CHARSZ));
 	n_used_rumors++;
 	outline(rumf);
 none:
 	(void) fclose(rumf);
 }
 
-used(i) register int i; {
-	return(usedbits[i/CHARSZ] & (1 << (i % CHARSZ)));
+int
+used(i)
+	int             i;
+{
+	return (usedbits[i / CHARSZ] & (1 << (i % CHARSZ)));
 }