Module Name: src
Committed By: dholland
Date: Wed Aug 12 08:54:54 UTC 2009
Modified Files:
src/games/trek: capture.c computer.c dumpgame.c getpar.c help.c lose.c
phaser.c play.c shield.c srscan.c trek.h visual.c
Log Message:
sprinkle static
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/games/trek/capture.c src/games/trek/play.c
cvs rdiff -u -r1.15 -r1.16 src/games/trek/computer.c
cvs rdiff -u -r1.14 -r1.15 src/games/trek/dumpgame.c src/games/trek/phaser.c
cvs rdiff -u -r1.17 -r1.18 src/games/trek/getpar.c src/games/trek/trek.h
cvs rdiff -u -r1.12 -r1.13 src/games/trek/help.c src/games/trek/shield.c
cvs rdiff -u -r1.9 -r1.10 src/games/trek/lose.c src/games/trek/visual.c
cvs rdiff -u -r1.10 -r1.11 src/games/trek/srscan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/trek/capture.c
diff -u src/games/trek/capture.c:1.11 src/games/trek/capture.c:1.12
--- src/games/trek/capture.c:1.11 Sun May 24 22:55:03 2009
+++ src/games/trek/capture.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** Cruddy, just takes one at random. Should ask the captain.
*/
-struct kling *
+static struct kling *
selectklingon(void)
{
int i;
Index: src/games/trek/play.c
diff -u src/games/trek/play.c:1.11 src/games/trek/play.c:1.12
--- src/games/trek/play.c:1.11 Sun May 24 21:44:56 2009
+++ src/games/trek/play.c Wed Aug 12 08:54:54 2009
@@ -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 @@
#include "trek.h"
#include "getpar.h"
+static void myreset(int) __dead;
+
/*
** INSTRUCTION READ AND MAIN PLAY LOOP
**
@@ -56,7 +58,7 @@
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 @@
};
/*ARGSUSED*/
-void
+static void
myreset(int v __unused)
{
Index: src/games/trek/computer.c
diff -u src/games/trek/computer.c:1.15 src/games/trek/computer.c:1.16
--- src/games/trek/computer.c:1.15 Sun May 24 23:20:22 2009
+++ src/games/trek/computer.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** command processor.
*/
-struct cvntab Cputab[] = {
+static struct cvntab Cputab[] = {
{ "ch", "art", (cmdfun)1, 0 },
{ "t", "rajectory", (cmdfun)2, 0 },
{ "c", "ourse", (cmdfun)3, 0 },
Index: src/games/trek/dumpgame.c
diff -u src/games/trek/dumpgame.c:1.14 src/games/trek/dumpgame.c:1.15
--- src/games/trek/dumpgame.c:1.14 Sun May 24 21:44:56 2009
+++ src/games/trek/dumpgame.c Wed Aug 12 08:54:54 2009
@@ -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 @@
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) },
Index: src/games/trek/phaser.c
diff -u src/games/trek/phaser.c:1.14 src/games/trek/phaser.c:1.15
--- src/games/trek/phaser.c:1.14 Sun May 24 22:55:03 2009
+++ src/games/trek/phaser.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** 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 }
Index: src/games/trek/getpar.c
diff -u src/games/trek/getpar.c:1.17 src/games/trek/getpar.c:1.18
--- src/games/trek/getpar.c:1.17 Mon May 25 00:43:34 2009
+++ src/games/trek/getpar.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** 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 }
Index: src/games/trek/trek.h
diff -u src/games/trek/trek.h:1.17 src/games/trek/trek.h:1.18
--- src/games/trek/trek.h:1.17 Mon May 25 00:07:14 2009
+++ src/games/trek/trek.h Wed Aug 12 08:54:54 2009
@@ -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 @@
/* capture.c */
void capture(int);
-struct kling *selectklingon(void);
/* check_out.c */
int check_out(int);
@@ -465,7 +464,6 @@
void phaser(int);
/* play.c */
-void myreset(int) __dead;
void play(void) __dead;
/* ram.c */
Index: src/games/trek/help.c
diff -u src/games/trek/help.c:1.12 src/games/trek/help.c:1.13
--- src/games/trek/help.c:1.12 Sun May 24 22:55:03 2009
+++ src/games/trek/help.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** to drop you. After that, it's your problem.
*/
-const char *const Cntvect[3] = {
+static const char *const Cntvect[3] = {
"first", "second", "third"
};
Index: src/games/trek/shield.c
diff -u src/games/trek/shield.c:1.12 src/games/trek/shield.c:1.13
--- src/games/trek/shield.c:1.12 Mon May 25 00:43:34 2009
+++ src/games/trek/shield.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** 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 }
Index: src/games/trek/lose.c
diff -u src/games/trek/lose.c:1.9 src/games/trek/lose.c:1.10
--- src/games/trek/lose.c:1.9 Sun May 24 21:44:56 2009
+++ src/games/trek/lose.c Wed Aug 12 08:54:54 2009
@@ -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 @@
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",
Index: src/games/trek/visual.c
diff -u src/games/trek/visual.c:1.9 src/games/trek/visual.c:1.10
--- src/games/trek/visual.c:1.9 Sun May 24 21:44:56 2009
+++ src/games/trek/visual.c Wed Aug 12 08:54:54 2009
@@ -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 @@
*/
/* 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 },
Index: src/games/trek/srscan.c
diff -u src/games/trek/srscan.c:1.10 src/games/trek/srscan.c:1.11
--- src/games/trek/srscan.c:1.10 Mon May 25 00:39:45 2009
+++ src/games/trek/srscan.c Wed Aug 12 08:54:54 2009
@@ -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 @@
** The current quadrant is filled in on the computer chart.
*/
-const char *const Color[4] = {
+static const char *const Color[4] = {
"GREEN",
"DOCKED",
"YELLOW",
