Module Name: src
Committed By: dholland
Date: Tue Jun 19 05:35:32 UTC 2012
Modified Files:
src/games/monop: cards.c execute.c getinp.c houses.c jail.c misc.c
monop.c morg.c print.c prop.c rent.c roll.c spec.c trade.c
Log Message:
WARNS=5
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/monop/cards.c
cvs rdiff -u -r1.21 -r1.22 src/games/monop/execute.c
cvs rdiff -u -r1.18 -r1.19 src/games/monop/getinp.c src/games/monop/morg.c
cvs rdiff -u -r1.14 -r1.15 src/games/monop/houses.c
cvs rdiff -u -r1.9 -r1.10 src/games/monop/jail.c
cvs rdiff -u -r1.22 -r1.23 src/games/monop/misc.c
cvs rdiff -u -r1.26 -r1.27 src/games/monop/monop.c
cvs rdiff -u -r1.12 -r1.13 src/games/monop/print.c
cvs rdiff -u -r1.19 -r1.20 src/games/monop/prop.c
cvs rdiff -u -r1.8 -r1.9 src/games/monop/rent.c
cvs rdiff -u -r1.13 -r1.14 src/games/monop/roll.c
cvs rdiff -u -r1.10 -r1.11 src/games/monop/spec.c
cvs rdiff -u -r1.15 -r1.16 src/games/monop/trade.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/monop/cards.c
diff -u src/games/monop/cards.c:1.24 src/games/monop/cards.c:1.25
--- src/games/monop/cards.c:1.24 Sun Sep 26 21:12:23 2010
+++ src/games/monop/cards.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cards.c,v 1.24 2010/09/26 21:12:23 dholland Exp $ */
+/* $NetBSD: cards.c,v 1.25 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: cards.c,v 1.24 2010/09/26 21:12:23 dholland Exp $");
+__RCSID("$NetBSD: cards.c,v 1.25 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -190,7 +190,7 @@ static const struct cardinfo ch_cards[]
* This routine initializes the decks from the data above.
*/
void
-init_decks()
+init_decks(void)
{
CC_D.info = cc_cards;
CC_D.num_cards = sizeof(cc_cards) / sizeof(cc_cards[0]);
@@ -204,8 +204,7 @@ init_decks()
* This routine sets up the offset pointers for the given deck.
*/
static void
-set_up(dp)
- DECK *dp;
+set_up(DECK *dp)
{
int r1, r2;
int i;
@@ -235,8 +234,7 @@ set_up(dp)
* This routine draws a card from the given deck
*/
void
-get_card(dp)
- DECK *dp;
+get_card(DECK *dp)
{
char type_maj, type_min;
int num;
@@ -358,8 +356,7 @@ printmes(const char *text)
* deck.
*/
void
-ret_card(plr)
- PLAY *plr;
+ret_card(PLAY *plr)
{
char type_maj;
int gojfpos, last_card;
Index: src/games/monop/execute.c
diff -u src/games/monop/execute.c:1.21 src/games/monop/execute.c:1.22
--- src/games/monop/execute.c:1.21 Sun Feb 24 06:12:49 2008
+++ src/games/monop/execute.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: execute.c,v 1.21 2008/02/24 06:12:49 dholland Exp $ */
+/* $NetBSD: execute.c,v 1.22 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)execute.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: execute.c,v 1.21 2008/02/24 06:12:49 dholland Exp $");
+__RCSID("$NetBSD: execute.c,v 1.22 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -78,8 +78,7 @@ static int getnum_withbrace(const char *
* This routine executes the given command by index number
*/
void
-execute(com_num)
- int com_num;
+execute(int com_num)
{
new_play = FALSE; /* new_play is true if fixing */
(*func[com_num])();
@@ -95,7 +94,7 @@ execute(com_num)
* This routine moves a piece around.
*/
void
-do_move()
+do_move(void)
{
int r1, r2;
bool was_jail;
@@ -128,8 +127,7 @@ ret:
* This routine moves a normal move
*/
void
-move(rl)
- int rl;
+move(int rl)
{
int old_loc;
@@ -146,7 +144,7 @@ move(rl)
* This routine shows the results of a move
*/
static void
-show_move()
+show_move(void)
{
SQUARE *sqp;
@@ -241,7 +239,7 @@ reset_game(void)
* This routine saves the current game for use at a later date
*/
void
-save()
+save(void)
{
char *sp;
FILE *outf;
Index: src/games/monop/getinp.c
diff -u src/games/monop/getinp.c:1.18 src/games/monop/getinp.c:1.19
--- src/games/monop/getinp.c:1.18 Sun Feb 24 01:57:34 2008
+++ src/games/monop/getinp.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getinp.c,v 1.18 2008/02/24 01:57:34 dholland Exp $ */
+/* $NetBSD: getinp.c,v 1.19 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getinp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: getinp.c,v 1.18 2008/02/24 01:57:34 dholland Exp $");
+__RCSID("$NetBSD: getinp.c,v 1.19 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,7 @@ static char buf[257];
static int comp(const char *);
int
-getinp(prompt, lst)
- const char *prompt, *const lst[];
+getinp(const char *prompt, const char *const lst [])
{
int i, n_match, match = 0;
char *sp;
@@ -102,8 +101,7 @@ getinp(prompt, lst)
}
static int
-comp(s1)
- const char *s1;
+comp(const char *s1)
{
const char *sp, *tsp;
char c;
Index: src/games/monop/morg.c
diff -u src/games/monop/morg.c:1.18 src/games/monop/morg.c:1.19
--- src/games/monop/morg.c:1.18 Sun Feb 24 06:07:06 2008
+++ src/games/monop/morg.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: morg.c,v 1.18 2008/02/24 06:07:06 dholland Exp $ */
+/* $NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)morg.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: morg.c,v 1.18 2008/02/24 06:07:06 dholland Exp $");
+__RCSID("$NetBSD: morg.c,v 1.19 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -80,7 +80,7 @@ static void unm(int);
* be mortgaged.
*/
void
-mortgage()
+mortgage(void)
{
int propnum;
@@ -114,7 +114,7 @@ mortgage()
* This routine sets up the list of mortgageable property
*/
static int
-set_mlist()
+set_mlist(void)
{
OWN *op;
@@ -137,8 +137,7 @@ set_mlist()
* This routine actually mortgages the property.
*/
static void
-m(propnum)
- int propnum;
+m(int propnum)
{
int price;
@@ -154,7 +153,7 @@ m(propnum)
* to be unmortgaged.
*/
void
-unmortgage()
+unmortgage(void)
{
int propnum;
@@ -182,7 +181,7 @@ unmortgage()
* This routine sets up the list of mortgaged property
*/
static int
-set_umlist()
+set_umlist(void)
{
OWN *op;
Index: src/games/monop/houses.c
diff -u src/games/monop/houses.c:1.14 src/games/monop/houses.c:1.15
--- src/games/monop/houses.c:1.14 Sun Feb 24 03:26:26 2008
+++ src/games/monop/houses.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: houses.c,v 1.14 2008/02/24 03:26:26 dholland Exp $ */
+/* $NetBSD: houses.c,v 1.15 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)houses.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: houses.c,v 1.14 2008/02/24 03:26:26 dholland Exp $");
+__RCSID("$NetBSD: houses.c,v 1.15 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -56,7 +56,7 @@ static bool ready_for_hotels(MON *);
* These routines deal with buying and selling houses
*/
void
-buy_houses()
+buy_houses(void)
{
int num_mon;
MON *mp;
@@ -112,8 +112,7 @@ over:
}
static void
-buy_h(mnp)
- MON *mnp;
+buy_h(MON *mnp)
{
int i;
MON *mp;
@@ -217,7 +216,7 @@ err: printf("That makes the spread too
* This routine sells houses.
*/
void
-sell_houses()
+sell_houses(void)
{
int num_mon;
MON *mp;
@@ -263,8 +262,7 @@ over:
}
static void
-sell_h(mnp)
- MON *mnp;
+sell_h(MON *mnp)
{
int i;
MON *mp;
@@ -323,8 +321,7 @@ err: printf("That makes the spread too
}
static void
-list_cur(mp)
- MON *mp;
+list_cur(MON *mp)
{
int i;
SQUARE *sqp;
Index: src/games/monop/jail.c
diff -u src/games/monop/jail.c:1.9 src/games/monop/jail.c:1.10
--- src/games/monop/jail.c:1.9 Sun Feb 24 01:57:34 2008
+++ src/games/monop/jail.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: jail.c,v 1.9 2008/02/24 01:57:34 dholland Exp $ */
+/* $NetBSD: jail.c,v 1.10 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)jail.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: jail.c,v 1.9 2008/02/24 01:57:34 dholland Exp $");
+__RCSID("$NetBSD: jail.c,v 1.10 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: jail.c,v 1.9 2008/02/2
* player out of jail.
*/
void
-card()
+card(void)
{
if (cur_p->loc != JAIL) {
printf("But you're not IN Jail\n");
@@ -64,7 +64,7 @@ card()
* This routine deals with paying your way out of jail.
*/
void
-pay()
+pay(void)
{
if (cur_p->loc != JAIL) {
printf("But you're not IN Jail\n");
@@ -80,8 +80,7 @@ pay()
* This routine deals with a move in jail
*/
int
-move_jail(r1, r2)
- int r1, r2;
+move_jail(int r1, int r2)
{
if (r1 != r2) {
printf("Sorry, that doesn't get you out\n");
@@ -104,7 +103,7 @@ moveit:
}
void
-printturn()
+printturn(void)
{
if (cur_p->loc != JAIL)
return;
Index: src/games/monop/misc.c
diff -u src/games/monop/misc.c:1.22 src/games/monop/misc.c:1.23
--- src/games/monop/misc.c:1.22 Thu Dec 1 07:05:52 2011
+++ src/games/monop/misc.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.22 2011/12/01 07:05:52 ahoka Exp $ */
+/* $NetBSD: misc.c,v 1.23 2012/06/19 05:35:32 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.22 2011/12/01 07:05:52 ahoka Exp $");
+__RCSID("$NetBSD: misc.c,v 1.23 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -52,8 +52,7 @@ static void is_monop(MON *, int);
* "yes or "no" answer is gotten.
*/
int
-getyn(prompt)
- const char *prompt;
+getyn(const char *prompt)
{
int com;
@@ -68,7 +67,7 @@ getyn(prompt)
* This routine tells the player if he's out of money.
*/
void
-notify()
+notify(void)
{
if (cur_p->money < 0)
printf("That leaves you $%d in debt\n", -cur_p->money);
@@ -84,7 +83,7 @@ notify()
* This routine switches to the next player
*/
void
-next_play()
+next_play(void)
{
player = (player + 1) % num_play;
cur_p = &play[player];
@@ -96,8 +95,7 @@ next_play()
* given prompt.
*/
int
-get_int(prompt)
- const char *prompt;
+get_int(const char *prompt)
{
long num;
char *sp;
@@ -126,8 +124,7 @@ get_int(prompt)
* This routine sets the monopoly flag from the list given.
*/
void
-set_ownlist(pl)
- int pl;
+set_ownlist(int pl)
{
int num; /* general counter */
MON *orig; /* remember starting monop ptr */
@@ -238,9 +235,7 @@ set_ownlist(pl)
* This routine sets things up as if it is a new monopoly
*/
static void
-is_monop(mp, pl)
- MON *mp;
- int pl;
+is_monop(MON *mp, int pl)
{
int i;
@@ -255,8 +250,7 @@ is_monop(mp, pl)
* This routine sets things up as if it is no longer a monopoly
*/
void
-is_not_monop(mp)
- MON *mp;
+is_not_monop(MON *mp)
{
int i;
@@ -270,7 +264,7 @@ is_not_monop(mp)
* This routine gives a list of the current player's routine
*/
void
-list()
+list(void)
{
printhold(player);
}
@@ -279,7 +273,7 @@ list()
* This routine gives a list of a given players holdings
*/
void
-list_all()
+list_all(void)
{
int pl;
@@ -292,7 +286,7 @@ list_all()
* This routine gives the players a chance before it exits.
*/
void
-quit()
+quit(void)
{
putchar('\n');
Index: src/games/monop/monop.c
diff -u src/games/monop/monop.c:1.26 src/games/monop/monop.c:1.27
--- src/games/monop/monop.c:1.26 Thu Dec 1 07:05:52 2011
+++ src/games/monop/monop.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: monop.c,v 1.26 2011/12/01 07:05:52 ahoka Exp $ */
+/* $NetBSD: monop.c,v 1.27 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: monop.c,v 1.26 2011/12/01 07:05:52 ahoka Exp $");
+__RCSID("$NetBSD: monop.c,v 1.27 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -223,9 +223,7 @@ SQUARE board[N_SQRS+1] = { /* board itse
* This program implements a monopoly game
*/
int
-main(ac, av)
- int ac;
- char *av[];
+main(int ac, char *av[])
{
/* Revoke setgid privileges */
setgid(getgid());
@@ -254,8 +252,7 @@ main(ac, av)
/*ARGSUSED*/
static void
-do_quit(n)
- int n __unused;
+do_quit(int n __unused)
{
quit();
}
@@ -264,7 +261,7 @@ do_quit(n)
* This routine gets the names of the players
*/
static void
-getplayers()
+getplayers(void)
{
int i, j;
char buf[257];
@@ -318,7 +315,7 @@ blew_it:
* This routine figures out who goes first
*/
static void
-init_players()
+init_players(void)
{
int i, rl, cur_max;
bool over = 0;
@@ -350,7 +347,7 @@ again:
* This routine initializes the monopoly structures.
*/
static void
-init_monops()
+init_monops(void)
{
MON *mp;
int i;
Index: src/games/monop/print.c
diff -u src/games/monop/print.c:1.12 src/games/monop/print.c:1.13
--- src/games/monop/print.c:1.12 Sun Feb 24 03:56:49 2008
+++ src/games/monop/print.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.12 2008/02/24 03:56:49 christos Exp $ */
+/* $NetBSD: print.c,v 1.13 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: print.c,v 1.12 2008/02/24 03:56:49 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.13 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -48,7 +48,7 @@ static void printmorg(const SQUARE *);
* This routine prints out the current board
*/
void
-printboard()
+printboard(void)
{
int i;
@@ -64,7 +64,7 @@ printboard()
* This routine lists where each player is.
*/
void
-where()
+where(void)
{
int i;
@@ -160,8 +160,7 @@ printsq(int sqn, bool eoln)
* This routine prints out the mortgage flag.
*/
static void
-printmorg(sqp)
- const SQUARE *sqp;
+printmorg(const SQUARE *sqp)
{
if (sqp->desc->morg)
printf(" * ");
@@ -173,8 +172,7 @@ printmorg(sqp)
* This routine lists the holdings of the player given
*/
void
-printhold(pl)
- int pl;
+printhold(int pl)
{
OWN *op;
PLAY *pp;
Index: src/games/monop/prop.c
diff -u src/games/monop/prop.c:1.19 src/games/monop/prop.c:1.20
--- src/games/monop/prop.c:1.19 Sun Feb 24 05:53:33 2008
+++ src/games/monop/prop.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: prop.c,v 1.19 2008/02/24 05:53:33 dholland Exp $ */
+/* $NetBSD: prop.c,v 1.20 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)prop.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: prop.c,v 1.19 2008/02/24 05:53:33 dholland Exp $");
+__RCSID("$NetBSD: prop.c,v 1.20 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -49,9 +49,7 @@ static int value(SQUARE *);
* appropriate flags.
*/
void
-buy(playernum, sqrp)
- int playernum;
- SQUARE *sqrp;
+buy(int playernum, SQUARE *sqrp)
{
trading = FALSE;
sqrp->owner = playernum;
@@ -62,10 +60,7 @@ buy(playernum, sqrp)
* This routine adds an item to the list.
*/
void
-add_list(plr, head, op_sqr)
- int plr;
- OWN **head;
- int op_sqr;
+add_list(int plr, OWN **head, int op_sqr)
{
int val;
OWN *tp, *last_tp;
@@ -133,8 +128,7 @@ del_list(int plr, OWN **head, short op_s
* given square.
*/
static int
-value(sqp)
- SQUARE *sqp;
+value(SQUARE *sqp)
{
int sqr;
@@ -160,7 +154,7 @@ value(sqp)
* This routine accepts bids for the current piece of property.
*/
void
-bid()
+bid(void)
{
static bool in[MAX_PL];
int i, num_in, cur_max;
@@ -214,8 +208,7 @@ bid()
* of given player.
*/
int
-prop_worth(plp)
- PLAY *plp;
+prop_worth(PLAY *plp)
{
OWN *op;
int worth;
Index: src/games/monop/rent.c
diff -u src/games/monop/rent.c:1.8 src/games/monop/rent.c:1.9
--- src/games/monop/rent.c:1.8 Sun Feb 24 01:57:34 2008
+++ src/games/monop/rent.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rent.c,v 1.8 2008/02/24 01:57:34 dholland Exp $ */
+/* $NetBSD: rent.c,v 1.9 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)rent.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rent.c,v 1.8 2008/02/24 01:57:34 dholland Exp $");
+__RCSID("$NetBSD: rent.c,v 1.9 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -44,8 +44,7 @@ __RCSID("$NetBSD: rent.c,v 1.8 2008/02/2
* This routine has the player pay rent
*/
void
-rent(sqp)
- SQUARE *sqp;
+rent(SQUARE *sqp)
{
int rnt = 0;
PROP *pp;
Index: src/games/monop/roll.c
diff -u src/games/monop/roll.c:1.13 src/games/monop/roll.c:1.14
--- src/games/monop/roll.c:1.13 Sun Feb 24 06:07:06 2008
+++ src/games/monop/roll.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: roll.c,v 1.13 2008/02/24 06:07:06 dholland Exp $ */
+/* $NetBSD: roll.c,v 1.14 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: roll.c,v 1.13 2008/02/24 06:07:06 dholland Exp $");
+__RCSID("$NetBSD: roll.c,v 1.14 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -47,8 +47,7 @@ __RCSID("$NetBSD: roll.c,v 1.13 2008/02/
*/
int
-roll(ndie, nsides)
- int ndie, nsides;
+roll(int ndie, int nsides)
{
long tot;
Index: src/games/monop/spec.c
diff -u src/games/monop/spec.c:1.10 src/games/monop/spec.c:1.11
--- src/games/monop/spec.c:1.10 Sun Feb 24 01:57:34 2008
+++ src/games/monop/spec.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spec.c,v 1.10 2008/02/24 01:57:34 dholland Exp $ */
+/* $NetBSD: spec.c,v 1.11 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: spec.c,v 1.10 2008/02/24 01:57:34 dholland Exp $");
+__RCSID("$NetBSD: spec.c,v 1.11 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -49,7 +49,7 @@ static const char *const perc[] = {
* collect income tax
*/
void
-inc_tax()
+inc_tax(void)
{
int worth, com_num;
@@ -81,7 +81,7 @@ inc_tax()
* move player to jail
*/
void
-goto_jail()
+goto_jail(void)
{
cur_p->loc = JAIL;
}
@@ -90,7 +90,7 @@ goto_jail()
* landing on luxury tax
*/
void
-lux_tax()
+lux_tax(void)
{
printf("You lose $75\n");
cur_p->money -= 75;
@@ -100,7 +100,7 @@ lux_tax()
* draw community chest card
*/
void
-cc()
+cc(void)
{
get_card(&CC_D);
}
@@ -109,7 +109,7 @@ cc()
* draw chance card
*/
void
-chance()
+chance(void)
{
get_card(&CH_D);
}
Index: src/games/monop/trade.c
diff -u src/games/monop/trade.c:1.15 src/games/monop/trade.c:1.16
--- src/games/monop/trade.c:1.15 Sun Feb 24 01:57:34 2008
+++ src/games/monop/trade.c Tue Jun 19 05:35:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trade.c,v 1.15 2008/02/24 01:57:34 dholland Exp $ */
+/* $NetBSD: trade.c,v 1.16 2012/06/19 05:35:32 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)trade.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: trade.c,v 1.15 2008/02/24 01:57:34 dholland Exp $");
+__RCSID("$NetBSD: trade.c,v 1.16 2012/06/19 05:35:32 dholland Exp $");
#endif
#endif /* not lint */
@@ -62,7 +62,7 @@ static void do_trade(void);
static void move_em(TRADE *, TRADE *);
void
-trade()
+trade(void)
{
int tradee, i;
@@ -102,8 +102,7 @@ over:
* player, and puts in the structure given.
*/
static void
-get_list(struct_no, play_no)
- int struct_no, play_no;
+get_list(int struct_no, int play_no)
{
int sn, pn;
PLAY *pp;
@@ -155,8 +154,7 @@ once_more:
* This routine sets up the list of tradable property.
*/
static int
-set_list(the_list)
- OWN *the_list;
+set_list(OWN *the_list)
{
int i;
OWN *op;
@@ -174,7 +172,7 @@ set_list(the_list)
* This routine summates the trade.
*/
static void
-summate()
+summate(void)
{
bool some;
int i;
@@ -205,7 +203,7 @@ summate()
* This routine actually executes the trade.
*/
static void
-do_trade()
+do_trade(void)
{
move_em(&trades[0], &trades[1]);
move_em(&trades[1], &trades[0]);
@@ -215,8 +213,7 @@ do_trade()
* This routine does a switch from one player to another
*/
static void
-move_em(from, to)
- TRADE *from, *to;
+move_em(TRADE *from, TRADE *to)
{
PLAY *pl_fr, *pl_to;
OWN *op;
@@ -240,7 +237,7 @@ move_em(from, to)
* This routine lets a player resign
*/
void
-resign()
+resign(void)
{
int i, new_own;
OWN *op;
