From df2ff83b8d06bdf49e72c595985c77d5b4ae7582 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Wed, 12 Aug 2009 08:54:54 +0000
Subject: sprinkle static

---
 trek/capture.c  |  8 +++++---
 trek/computer.c |  6 +++---
 trek/dumpgame.c |  6 +++---
 trek/getpar.c   |  6 +++---
 trek/help.c     |  6 +++---
 trek/lose.c     |  6 +++---
 trek/phaser.c   |  6 +++---
 trek/play.c     | 10 ++++++----
 trek/shield.c   |  6 +++---
 trek/srscan.c   |  6 +++---
 trek/trek.h     |  4 +---
 trek/visual.c   |  6 +++---
 12 files changed, 39 insertions(+), 37 deletions(-)

(limited to 'trek')

diff --git a/trek/capture.c b/trek/capture.c
index bc3d0932..48a70e81 100644
--- a/trek/capture.c
+++ b/trek/capture.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: capture.c,v 1.11 2009/05/24 22:55:03 dholland Exp $	*/
+/*	$NetBSD: capture.c,v 1.12 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,13 +34,15 @@
 #if 0
 static char sccsid[] = "@(#)capture.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: capture.c,v 1.11 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: capture.c,v 1.12 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include "trek.h"
 
+static struct kling *selectklingon(void);
+
 /*
 **  Ask a Klingon To Surrender
 **
@@ -121,7 +123,7 @@ capture(int v __unused)
 **	Cruddy, just takes one at random.  Should ask the captain.
 */
 
-struct kling *
+static struct kling *
 selectklingon(void)
 {
 	int		i;
diff --git a/trek/computer.c b/trek/computer.c
index c3c507d4..2b3e0522 100644
--- a/trek/computer.c
+++ b/trek/computer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: computer.c,v 1.15 2009/05/24 23:20:22 dholland Exp $	*/
+/*	$NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)computer.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: computer.c,v 1.15 2009/05/24 23:20:22 dholland Exp $");
+__RCSID("$NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -90,7 +90,7 @@ __RCSID("$NetBSD: computer.c,v 1.15 2009/05/24 23:20:22 dholland Exp $");
 **	command processor.
 */
 
-struct cvntab Cputab[] = {
+static struct cvntab Cputab[] = {
 	{ "ch",		"art",			(cmdfun)1,		0 },
 	{ "t",		"rajectory",		(cmdfun)2,		0 },
 	{ "c",		"ourse",		(cmdfun)3,		0 },
diff --git a/trek/dumpgame.c b/trek/dumpgame.c
index 0c98662d..d3926813 100644
--- a/trek/dumpgame.c
+++ b/trek/dumpgame.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumpgame.c,v 1.14 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: dumpgame.c,v 1.15 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dumpgame.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: dumpgame.c,v 1.14 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.15 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -55,7 +55,7 @@ struct dump {
 static int readdump(int);
 
 
-struct dump Dump_template[] = {
+static struct dump Dump_template[] = {
 	{ (char *)&Ship,	sizeof (Ship) },
 	{ (char *)&Now,		sizeof (Now) },
 	{ (char *)&Param,	sizeof (Param) },
diff --git a/trek/getpar.c b/trek/getpar.c
index be3f180b..4a271d32 100644
--- a/trek/getpar.c
+++ b/trek/getpar.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getpar.c,v 1.17 2009/05/25 00:43:34 dholland Exp $	*/
+/*	$NetBSD: getpar.c,v 1.18 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getpar.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getpar.c,v 1.17 2009/05/25 00:43:34 dholland Exp $");
+__RCSID("$NetBSD: getpar.c,v 1.18 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -96,7 +96,7 @@ getfltpar(const char *s)
  **	get yes/no parameter
  **/
 
-const struct cvntab	Yntab[] = {
+static const struct cvntab Yntab[] = {
 	{ "y",	"es",	(cmdfun)1,	1 },
 	{ "n",	"o",	(cmdfun)0,	0 },
 	{ NULL,	NULL,	NULL,		0 }
diff --git a/trek/help.c b/trek/help.c
index 021a30ee..16b4716a 100644
--- a/trek/help.c
+++ b/trek/help.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: help.c,v 1.12 2009/05/24 22:55:03 dholland Exp $	*/
+/*	$NetBSD: help.c,v 1.13 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: help.c,v 1.12 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: help.c,v 1.13 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ __RCSID("$NetBSD: help.c,v 1.12 2009/05/24 22:55:03 dholland Exp $");
 **	to drop you.  After that, it's your problem.
 */
 
-const char *const Cntvect[3] = {
+static const char *const Cntvect[3] = {
 	"first", "second", "third"
 };
 
diff --git a/trek/lose.c b/trek/lose.c
index 974b1776..957712f5 100644
--- a/trek/lose.c
+++ b/trek/lose.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: lose.c,v 1.10 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lose.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: lose.c,v 1.10 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -54,7 +54,7 @@ __RCSID("$NetBSD: lose.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 
 extern jmp_buf	env;
 
-const char	*const Losemsg[] = {
+static const char *const Losemsg[] = {
 	"You ran out of time",
 	"You ran out of energy",
 	"You have been destroyed",
diff --git a/trek/phaser.c b/trek/phaser.c
index cb2c0791..6328ee5a 100644
--- a/trek/phaser.c
+++ b/trek/phaser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: phaser.c,v 1.14 2009/05/24 22:55:03 dholland Exp $	*/
+/*	$NetBSD: phaser.c,v 1.15 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)phaser.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: phaser.c,v 1.14 2009/05/24 22:55:03 dholland Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.15 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -76,7 +76,7 @@ __RCSID("$NetBSD: phaser.c,v 1.14 2009/05/24 22:55:03 dholland Exp $");
 **	Uses trace flag 30
 */
 
-struct cvntab	Matab[] = {
+static struct cvntab Matab[] = {
 	{ "m",		"anual",	(cmdfun) 1,	0 },
 	{ "a",		"utomatic",	(cmdfun) 0,	0 },
 	{ NULL,		NULL,		NULL,		0 }
diff --git a/trek/play.c b/trek/play.c
index 9d8e6347..85649330 100644
--- a/trek/play.c
+++ b/trek/play.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: play.c,v 1.12 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: play.c,v 1.12 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -43,6 +43,8 @@ __RCSID("$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 dholland Exp $");
 #include "trek.h"
 #include "getpar.h"
 
+static void myreset(int) __dead;
+
 /*
 **  INSTRUCTION READ AND MAIN PLAY LOOP
 **
@@ -56,7 +58,7 @@ __RCSID("$NetBSD: play.c,v 1.11 2009/05/24 21:44:56 dholland Exp $");
 
 extern jmp_buf env;
 
-const struct cvntab	Comtab[] = {
+static const struct cvntab Comtab[] = {
 	{ "abandon",		"",		abandon,	0 },
 	{ "ca",			"pture",	capture,	0 },
 	{ "cl",			"oak",		shield,		-1 },
@@ -84,7 +86,7 @@ const struct cvntab	Comtab[] = {
 };
 
 /*ARGSUSED*/
-void
+static void
 myreset(int v __unused)
 {
 
diff --git a/trek/shield.c b/trek/shield.c
index bcc31d2e..a14c22a7 100644
--- a/trek/shield.c
+++ b/trek/shield.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: shield.c,v 1.12 2009/05/25 00:43:34 dholland Exp $	*/
+/*	$NetBSD: shield.c,v 1.13 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)shield.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: shield.c,v 1.12 2009/05/25 00:43:34 dholland Exp $");
+__RCSID("$NetBSD: shield.c,v 1.13 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ __RCSID("$NetBSD: shield.c,v 1.12 2009/05/25 00:43:34 dholland Exp $");
 **	so you get partial hits.
 */
 
-const struct cvntab Udtab[] = {
+static const struct cvntab Udtab[] = {
 	{ "u",		"p",		(cmdfun)1,	0 },
 	{ "d",		"own",		(cmdfun)0,	0 },
 	{ NULL,		NULL,		NULL,		0 }
diff --git a/trek/srscan.c b/trek/srscan.c
index 4c8c1c3c..64c6d290 100644
--- a/trek/srscan.c
+++ b/trek/srscan.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: srscan.c,v 1.10 2009/05/25 00:39:45 dholland Exp $	*/
+/*	$NetBSD: srscan.c,v 1.11 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)srscan.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: srscan.c,v 1.10 2009/05/25 00:39:45 dholland Exp $");
+__RCSID("$NetBSD: srscan.c,v 1.11 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: srscan.c,v 1.10 2009/05/25 00:39:45 dholland Exp $");
 **	The current quadrant is filled in on the computer chart.
 */
 
-const char	*const Color[4] = {
+static const char *const Color[4] = {
 	"GREEN",
 	"DOCKED",
 	"YELLOW",
diff --git a/trek/trek.h b/trek/trek.h
index b92c8b6d..99c61e48 100644
--- a/trek/trek.h
+++ b/trek/trek.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: trek.h,v 1.17 2009/05/25 00:07:14 dholland Exp $	*/
+/*	$NetBSD: trek.h,v 1.18 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -379,7 +379,6 @@ void autover(void);
 
 /* capture.c */
 void capture(int);
-struct kling *selectklingon(void);
 
 /* check_out.c */
 int check_out(int);
@@ -465,7 +464,6 @@ void out(int);
 void phaser(int);
 
 /* play.c */
-void myreset(int) __dead;
 void play(void) __dead;
 
 /* ram.c */
diff --git a/trek/visual.c b/trek/visual.c
index b0b2bb3e..286901e2 100644
--- a/trek/visual.c
+++ b/trek/visual.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: visual.c,v 1.9 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: visual.c,v 1.10 2009/08/12 08:54:54 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)visual.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: visual.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: visual.c,v 1.10 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -52,7 +52,7 @@ __RCSID("$NetBSD: visual.c,v 1.9 2009/05/24 21:44:56 dholland Exp $");
 */
 
 /* This struct[] has the delta x, delta y for particular directions */
-struct xy	Visdelta[11] = {
+static struct xy Visdelta[11] = {
 	{ -1,	-1 },
 	{ -1,	 0 },
 	{ -1,	 1 },
-- 
cgit v1.2.3-56-ge451