From 8916e2056e90ba2c157dfd2b98fb48837d565646 Mon Sep 17 00:00:00 2001 From: dholland Date: Wed, 12 Aug 2009 08:04:05 +0000 Subject: sprinkle static --- monop/misc.c | 8 +++++--- monop/monop.c | 24 ++++++++++++------------ monop/monop.h | 11 +++++------ 3 files changed, 22 insertions(+), 21 deletions(-) (limited to 'monop') diff --git a/monop/misc.c b/monop/misc.c index 16886db8..3f881072 100644 --- a/monop/misc.c +++ b/monop/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.20 2008/02/24 03:52:09 christos Exp $ */ +/* $NetBSD: misc.c,v 1.21 2009/08/12 08:10:49 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: misc.c,v 1.20 2008/02/24 03:52:09 christos Exp $"); +__RCSID("$NetBSD: misc.c,v 1.21 2009/08/12 08:10:49 dholland Exp $"); #endif #endif /* not lint */ @@ -45,6 +45,8 @@ __RCSID("$NetBSD: misc.c,v 1.20 2008/02/24 03:52:09 christos Exp $"); #include "monop.h" +static void is_monop(MON *, int); + /* * This routine executes a truncated set of commands until a * "yes or "no" answer is gotten. @@ -234,7 +236,7 @@ set_ownlist(pl) /* * This routine sets things up as if it is a new monopoly */ -void +static void is_monop(mp, pl) MON *mp; int pl; diff --git a/monop/monop.c b/monop/monop.c index 6a945581..3a54fccd 100644 --- a/monop/monop.c +++ b/monop/monop.c @@ -1,4 +1,4 @@ -/* $NetBSD: monop.c,v 1.24 2008/07/20 01:03:21 lukem Exp $ */ +/* $NetBSD: monop.c,v 1.25 2009/08/12 08:10:49 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\ #if 0 static char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: monop.c,v 1.24 2008/07/20 01:03:21 lukem Exp $"); +__RCSID("$NetBSD: monop.c,v 1.25 2009/08/12 08:10:49 dholland Exp $"); #endif #endif /* not lint */ @@ -63,8 +63,8 @@ bool fixing, /* set if fixing up debt */ told_em, /* set if told user he's out of debt */ spec; /* set if moving by card to RR or UTIL */ -const char *name_list[MAX_PL+2], /* list of players' names */ - *const comlist[] = { /* list of normal commands */ +const char *name_list[MAX_PL+2]; /* list of players' names */ +static const char *const comlist[] = { /* list of normal commands */ "quit", /* 0 */ "print", /* 1 */ "where", /* 2 */ "own holdings", /* 3 */ "holdings", /* 4 */ "mortgage", /* 5 */ @@ -75,15 +75,15 @@ const char *name_list[MAX_PL+2], /* list of players' names */ "restore", /* 14 */ "roll", /* 15 */ "", /* 16 */ 0 - }, - *const yncoms[] = { /* list of commands for yes/no answers */ +}; +const char *const yncoms[] = { /* list of commands for yes/no answers */ "yes", /* 0 */ "no", /* 1 */ "quit", /* 2 */ "print", /* 3 */ "where", /* 4 */ "own holdings", /* 5 */ "holdings", /* 6 */ 0 - }, - *const lucky_mes[] = { /* "got lucky" messages */ +}; +const char *const lucky_mes[] = { /* "got lucky" messages */ "You lucky stiff", "You got lucky", "What a lucky person!", "You must have a 4-leaf clover", "My, my! Aren't we lucky!", "Luck smiles upon you", @@ -91,7 +91,7 @@ const char *name_list[MAX_PL+2], /* list of players' names */ "Your karma must certainly be together", "How beautifully Cosmic", "Wow, you must be really with it" /* "I want your autograph", -- Save for later */ - }; +}; int player, /* current player number */ num_play, /* current number of players */ @@ -125,15 +125,15 @@ DECK deck[2]; /* Chance and Community Chest */ PLAY *play, /* player structure array ("calloc"ed) */ *cur_p; /* pointer to current player's struct */ -RR_S rr[N_RR]; /* railroad descriptions */ +static RR_S rr[N_RR]; /* railroad descriptions */ -UTIL_S util[2]; /* utility descriptions */ +static UTIL_S util[2]; /* utility descriptions */ #define MONINIT(num_in, h_cost, not_m, mon_n, sq1,sq2,sq3) \ {0, -1, num_in, 0, h_cost, not_m, mon_n, {sq1,sq2,sq3}, {0,0,0}} /* name owner num_own sq */ -MON mon[N_MON] = { /* monopoly descriptions */ +static MON mon[N_MON] = { /* monopoly descriptions */ /* num_in h_cost not_m mon_n sqnums */ MONINIT(2, 1, "Purple", "PURPLE", 1,3, 0), MONINIT(3, 1, "Lt. Blue", "LT. BLUE", 6,8,9), diff --git a/monop/monop.h b/monop/monop.h index bcbf97f7..ecc74204 100644 --- a/monop/monop.h +++ b/monop/monop.h @@ -1,4 +1,4 @@ -/* $NetBSD: monop.h,v 1.18 2008/02/24 06:07:06 dholland Exp $ */ +/* $NetBSD: monop.h,v 1.19 2009/08/12 08:10:49 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -131,23 +131,23 @@ typedef struct prp_st UTIL_S; extern bool trading, spec, fixing, told_em; -extern const char *const yncoms[], *const comlist[], *name_list[], *const lucky_mes[]; +extern const char *const yncoms[], *name_list[], *const lucky_mes[]; extern int num_play, player, num_doub, num_luck; extern void (*const func[])(void); -extern MON mon[N_MON]; +/*extern MON mon[N_MON];*/ extern PLAY *play, *cur_p; extern PROP prop[N_PROP]; -extern RR_S rr[N_RR]; +/*extern RR_S rr[N_RR];*/ extern SQUARE board[N_SQRS + 1]; -extern UTIL_S util[2]; +/*extern UTIL_S util[2];*/ /* cards.c */ @@ -180,7 +180,6 @@ void notify(void); void next_play(void); int get_int(const char *); void set_ownlist(int); -void is_monop(MON *, int); void is_not_monop(MON *); void list(void); void list_all(void); -- cgit v1.2.3-56-ge451