Remove extra semicolon.

[bsdgames-darwin.git] / hack / hack.rumors.c

diff --git a/hack/hack.rumors.c b/hack/hack.rumors.c
index f56e95b3f558d0c15fa499aac5b909323e09c0cb..757c5a63502dc40c276a73472e2abf57586a4316 100644 (file)
--- a/hack/hack.rumors.c
+++ b/hack/hack.rumors.c
@@ -1,24 +1,86 @@
-/*     $NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $ */
+/*     $NetBSD: hack.rumors.c,v 1.9 2011/08/06 20:18:26 dholland Exp $ */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $");
+__RCSID("$NetBSD: hack.rumors.c,v 1.9 2011/08/06 20:18:26 dholland Exp $");
 #endif                         /* not lint */
 
 #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;
 
-void
-init_rumors(rumf)
-       FILE           *rumf;
+static int n_rumors = 0;
+static int n_used_rumors = -1;
+static char *usedbits;
+
+static void init_rumors(FILE *);
+static int skipline(FILE *);
+static void outline(FILE *);
+static int used(int);
+
+static void
+init_rumors(FILE *rumf)
 {
        int             i;
        n_used_rumors = 0;
@@ -26,14 +88,13 @@ init_rumors(rumf)
                n_rumors++;
        rewind(rumf);
        i = n_rumors / CHARSZ;
-       usedbits = (char *) alloc((unsigned) (i + 1));
+       usedbits = alloc(i + 1);
        for (; i >= 0; i--)
                usedbits[i] = 0;
 }
 
-int
-skipline(rumf)
-       FILE           *rumf;
+static int
+skipline(FILE *rumf)
 {
        char            line[COLNO];
        while (1) {
@@ -44,9 +105,8 @@ skipline(rumf)
        }
 }
 
-void
-outline(rumf)
-       FILE           *rumf;
+static void
+outline(FILE *rumf)
 {
        char            line[COLNO];
        char           *ep;
@@ -55,11 +115,11 @@ outline(rumf)
        if ((ep = strchr(line, '\n')) != 0)
                *ep = 0;
        pline("This cookie has a scrap of paper inside! It reads: ");
-       pline(line);
+       pline("%s", line);
 }
 
 void
-outrumor()
+outrumor(void)
 {
        int             rn, i;
        FILE           *rumf;
@@ -85,9 +145,8 @@ none:
        (void) fclose(rumf);
 }
 
-int
-used(i)
-       int             i;
+static int
+used(int i)
 {
        return (usedbits[i / CHARSZ] & (1 << (i % CHARSZ)));
 }