Clean up the names of the various pieces of socket apparatus.

[bsdgames-darwin.git] / trek / play.c

diff --git a/trek/play.c b/trek/play.c
index fe1f220013eec822a6c3d41a67a79f139b1cf73c..8564933002122d66b8ecca57a2b409c86913fda3 100644 (file)
--- a/trek/play.c
+++ b/trek/play.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $ */
+/*     $NetBSD: play.c,v 1.12 2009/08/12 08:54:54 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 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[] = "@(#)play.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: play.c,v 1.12 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,6 +43,8 @@ __RCSID("$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 #include "trek.h"
 #include "getpar.h"
 
+static void myreset(int) __dead;
+
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP
 **
@@ -58,8 +56,9 @@ __RCSID("$NetBSD: play.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 **     on how we are doing after the move.
 */
 
-const struct cvntab    Comtab[] =
-{
+extern jmp_buf env;
+
+static const struct cvntab Comtab[] = {
        { "abandon",            "",             abandon,        0 },
        { "ca",                 "pture",        capture,        0 },
        { "cl",                 "oak",          shield,         -1 },
@@ -87,22 +86,19 @@ const struct cvntab Comtab[] =
 };
 
 /*ARGSUSED*/
-void
-myreset(v)
-       int v;
+static void
+myreset(int v __unused)
 {
-       extern jmp_buf env;
 
        longjmp(env, 1);
 }
 
 void
-play()
+play(void)
 {
        const struct cvntab             *r;
 
-       while (1)
-       {
+       while (1) {
                Move.free = 1;
                Move.time = 0.0;
                Move.shldchg = 0;