fix typo.

[bsdgames-darwin.git] / battlestar / parse.c

diff --git a/battlestar/parse.c b/battlestar/parse.c
index ab19dbb7d77a698f81388003053995c3e337a322..4b4b3bc6244f55f2bfcaf390a03def28a6fa6e76 100644 (file)
--- a/battlestar/parse.c
+++ b/battlestar/parse.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.11 2000/09/24 14:11:09 jsm Exp $   */
+/*     $NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c    8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: parse.c,v 1.11 2000/09/24 14:11:09 jsm Exp $");
+__RCSID("$NetBSD: parse.c,v 1.15 2005/07/01 06:04:54 jmc Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -48,14 +44,14 @@ __RCSID("$NetBSD: parse.c,v 1.11 2000/09/24 14:11:09 jsm Exp $");
 #define HASHMUL                81
 #define HASHMASK       (HASHSIZE - 1)
 
-static int hash __P((const char *));
-static void install __P((struct wlist *));
-static struct wlist *lookup __P((const char *));
+static int hash(const char *);
+static void install(struct wlist *);
+static struct wlist *lookup(const char *);
 
 static struct wlist *hashtab[HASHSIZE];
 
 void
-wordinit()
+wordinit(void)
 {
        struct wlist *w;
 
@@ -64,8 +60,7 @@ wordinit()
 }
 
 static int
-hash(s)
-       const char   *s;
+hash(const char *s)
 {
        int     hashval = 0;
 
@@ -78,8 +73,7 @@ hash(s)
 }
 
 static struct wlist *
-lookup(s)
-       const char   *s;
+lookup(const char   *s)
 {
        struct wlist *wp;
 
@@ -90,8 +84,7 @@ lookup(s)
 }
 
 static void
-install(wp)
-       struct wlist *wp;
+install(struct wlist *wp)
 {
        int     hashval;
 
@@ -104,7 +97,7 @@ install(wp)
 }
 
 void
-parse()
+parse(void)
 {
        struct wlist *wp;
        int     n;
@@ -155,14 +148,16 @@ parse()
        /* If there is a sequence (NOUN | OBJECT) AND EVERYTHING
         * then move all the EVERYTHINGs to the beginning, since that's where
         * they're expected.  We can't get rid of the NOUNs and OBJECTs in
-        * case they aren't in EVERYTHING (i.e. not here or nonexistant).
+        * case they aren't in EVERYTHING (i.e. not here or nonexistent).
         */
        flag = 1;
        while (flag) {
                flag = 0;
                for (n = 1; n < wordcount; n++)
-                       if ((wordtype[n - 1] == NOUNS || wordtype[n - 1] == OBJECT) &&
-                           wordvalue[n] == AND && wordvalue[n + 1] == EVERYTHING) {
+                       if ((wordtype[n - 1] == NOUNS || 
+                           wordtype[n - 1] == OBJECT) &&
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
                                char tmpword[WORDLEN];
                                wordvalue[n + 1] = wordvalue[n - 1];
                                wordvalue[n - 1] = EVERYTHING;
@@ -176,7 +171,8 @@ parse()
                /* And trim EVERYTHING AND EVERYTHING. */
                for (n = 1; n < wordcount; n++)
                        if (wordvalue[n - 1] == EVERYTHING &&
-                           wordvalue[n] == AND && wordvalue[n + 1] == EVERYTHING) {
+                           wordvalue[n] == AND && 
+                           wordvalue[n + 1] == EVERYTHING) {
                                int i;
                                for (i = n + 1; i < wordcount; i++) {
                                        wordtype[i - 1] = wordtype[i + 1];