KNF/whitespace nits. No functional changes.

diff --git a/monop/cards.c b/monop/cards.c
index 4eee055b6e3d062d9d2b2c49960e10d5d7815ebb..bf878ee992b4d784941e1d0439f8b152547676c7 100644 (file)
--- a/monop/cards.c
+++ b/monop/cards.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: cards.c,v 1.16 2008/02/19 09:30:26 dholland Exp $      */
+/*     $NetBSD: cards.c,v 1.17 2008/02/19 09:45:02 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.16 2008/02/19 09:30:26 dholland Exp $");
+__RCSID("$NetBSD: cards.c,v 1.17 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ init_decks()
 {
        int32_t nc;
 
-       if ((deckf=fopen(cardfile, "r")) == NULL) {
+       if ((deckf = fopen(cardfile, "r")) == NULL) {
 file_err:
                err(1, "%s", cardfile);
        }

diff --git a/monop/execute.c b/monop/execute.c
index 72d04773db730f0fcf7d4b637c2bde85566d20a9..bbddcbb923c3aaba9a0435a9019cc33af02a541b 100644 (file)
--- a/monop/execute.c
+++ b/monop/execute.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: execute.c,v 1.13 2008/02/19 09:30:26 dholland Exp $    */
+/*     $NetBSD: execute.c,v 1.14 2008/02/19 09:45:02 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.13 2008/02/19 09:30:26 dholland Exp $");
+__RCSID("$NetBSD: execute.c,v 1.14 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ static void show_move(void);
  */
 void
 execute(com_num)
-       int com_num; 
+       int com_num;
 {
        new_play = FALSE;       /* new_play is true if fixing   */
        (*func[com_num])();
@@ -80,7 +80,7 @@ execute(com_num)
  *     This routine moves a piece around.
  */
 void
-do_move() 
+do_move()
 {
        int r1, r2;
        bool was_jail;
@@ -114,7 +114,7 @@ ret:
  */
 void
 move(rl)
-       int rl; 
+       int rl;
 {
        int old_loc;
 
@@ -131,7 +131,7 @@ move(rl)
  *     This routine shows the results of a move
  */
 static void
-show_move() 
+show_move()
 {
        SQUARE *sqp;
 
@@ -142,15 +142,20 @@ show_move()
                printf("That is a safe place\n");
                break;
          case CC:
-               cc(); break;
+               cc();
+               break;
          case CHANCE:
-               chance(); break;
+               chance();
+               break;
          case INC_TAX:
-               inc_tax(); break;
+               inc_tax();
+               break;
          case GOTO_J:
-               goto_jail(); break;
+               goto_jail();
+               break;
          case LUX_TAX:
-               lux_tax(); break;
+               lux_tax();
+               break;
          case PRPTY:
          case RR:
          case UTIL:
@@ -174,7 +179,7 @@ show_move()
  *     This routine saves the current game for use at a later date
  */
 void
-save() 
+save()
 {
        char *sp;
        int outf, num;
@@ -184,7 +189,7 @@ save()
 
        printf("Which file do you wish to save it in? ");
        sp = buf;
-       while ((*sp++=getchar()) != '\n')
+       while ((*sp++ = getchar()) != '\n')
                continue;
        *--sp = '\0';
 
@@ -196,7 +201,7 @@ save()
            && getyn("File exists.  Do you wish to overwrite? ") > 0)
                return;
 
-       if ((outf=creat(buf, 0644)) < 0) {
+       if ((outf = creat(buf, 0644)) < 0) {
                warn("%s", buf);
                return;
        }
@@ -221,12 +226,12 @@ save()
  *     This routine restores an old game from a file
  */
 void
-restore() 
+restore()
 {
        char *sp;
 
        printf("Which file do you wish to restore from? ");
-       for (sp = buf; (*sp=getchar()) != '\n'; sp++)
+       for (sp = buf; (*sp = getchar()) != '\n'; sp++)
                continue;
        *sp = '\0';
        rest_f(buf);
@@ -238,7 +243,7 @@ restore()
  */
 int
 rest_f(file)
-       const char *file; 
+       const char *file;
 {
        char *sp;
        int inf, num;
@@ -246,7 +251,7 @@ rest_f(file)
        char *start, *end;
        STAT sbuf;
 
-       if ((inf=open(file, O_RDONLY)) < 0) {
+       if ((inf = open(file, O_RDONLY)) < 0) {
                warn("%s", file);
                return FALSE;
        }

diff --git a/monop/getinp.c b/monop/getinp.c
index 2166b9fa6b77692c71694e39c973d349f3579284..4e1c28811068e230485a52834c545aa5d37f7b94 100644 (file)
--- a/monop/getinp.c
+++ b/monop/getinp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getinp.c,v 1.15 2008/01/28 06:16:13 dholland Exp $     */
+/*     $NetBSD: getinp.c,v 1.16 2008/02/19 09:45:02 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.15 2008/01/28 06:16:13 dholland Exp $");
+__RCSID("$NetBSD: getinp.c,v 1.16 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ static int comp(const char *);
 
 int
 getinp(prompt, lst)
-       const char *prompt, *const lst[]; 
+       const char *prompt, *const lst[];
 {
        int i, n_match, match = 0;
        char *sp;
@@ -59,7 +59,7 @@ getinp(prompt, lst)
 
        for (;;) {
                printf("%s", prompt);
-               for (sp = buf; (c=getchar()) != '\n'; ) {
+               for (sp = buf; (c = getchar()) != '\n'; ) {
                        if (c == -1)
                                return 0;
                        *sp = c;

diff --git a/monop/jail.c b/monop/jail.c
index f6ad097973e3b1726d7a6f2a8eb5a825f7e6e4fb..cb69a1106e22e96f9b232a1775efc26f0d7afa74 100644 (file)
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $     */
+/*     $NetBSD: jail.c,v 1.7 2008/02/19 09:45:02 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.6 2003/08/07 09:37:28 agc Exp $");
+__RCSID("$NetBSD: jail.c,v 1.7 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -112,8 +112,7 @@ moveit:
                        return TRUE;
                }
                return FALSE;
-       }
-       else {
+       } else {
                printf("Double roll gets you out.\n");
                goto moveit;
        }

diff --git a/monop/monop.c b/monop/monop.c
index 1653e1366b53957fe2f1ec0f85794d22a2c070ce..08509622ebfb9e87d574de089ffde8e80aca9f10 100644 (file)
--- a/monop/monop.c
+++ b/monop/monop.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $ */
+/*     $NetBSD: monop.c,v 1.17 2008/02/19 09:45:02 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 #if 0
 static char sccsid[] = "@(#)monop.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: monop.c,v 1.16 2007/12/15 19:44:42 perry Exp $");
+__RCSID("$NetBSD: monop.c,v 1.17 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -110,7 +110,7 @@ getplayers()
 
 blew_it:
        for (;;) {
-               if ((num_play=get_int("How many players? ")) <= 0 ||
+               if ((num_play = get_int("How many players? ")) <= 0 ||
                    num_play > MAX_PL)
                        printf("Sorry. Number must range from 1 to 9\n");
                else
@@ -122,7 +122,7 @@ blew_it:
        for (i = 0; i < num_play; i++) {
 over:
                printf("Player %d's name: ", i + 1);
-               for (sp = buf; (*sp=getchar()) != '\n'; sp++)
+               for (sp = buf; (*sp = getchar()) != '\n'; sp++)
                        continue;
                if (sp == buf)
                        goto over;
@@ -188,7 +188,7 @@ again:
  *     This routine initializes the monopoly structures.
  */
 static void
-init_monops() 
+init_monops()
 {
        MON *mp;
        int i;

diff --git a/monop/morg.c b/monop/morg.c
index 231947268287b8e3645df7d10e554be3b4202a74..d654993d3db24dfd137428e8f3cea211af81bdc5 100644 (file)
--- a/monop/morg.c
+++ b/monop/morg.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: morg.c,v 1.12 2008/02/19 09:05:55 dholland Exp $       */
+/*     $NetBSD: morg.c,v 1.13 2008/02/19 09:45:02 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.12 2008/02/19 09:05:55 dholland Exp $");
+__RCSID("$NetBSD: morg.c,v 1.13 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -155,7 +155,7 @@ m(propnum)
  * to be unmortgaged.
  */
 void
-unmortgage() 
+unmortgage()
 {
        int propnum;
 

diff --git a/monop/print.c b/monop/print.c
index 9cd3c95b50902f408cdeafba3d5a9aa5b7f6f2db..898c6eef84cf52a59c10264f50fc2a323444dfb1 100644 (file)
--- a/monop/print.c
+++ b/monop/print.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.8 2004/01/27 20:30:30 jsm Exp $    */
+/*     $NetBSD: print.c,v 1.9 2008/02/19 09:45:02 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.8 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: print.c,v 1.9 2008/02/19 09:45:02 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()
 {
        int i;
 
@@ -64,7 +64,7 @@ printboard()
  *     This routine lists where each player is.
  */
 void
-where() 
+where()
 {
        int i;
 

diff --git a/monop/prop.c b/monop/prop.c
index 916129ad58c4371f58c65ae578dbb9a8ae2612c2..73c3152b906c968c0ec632a1614d02ca4938a673 100644 (file)
--- a/monop/prop.c
+++ b/monop/prop.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: prop.c,v 1.13 2008/02/19 09:32:34 dholland Exp $       */
+/*     $NetBSD: prop.c,v 1.14 2008/02/19 09:45:02 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.13 2008/02/19 09:32:34 dholland Exp $");
+__RCSID("$NetBSD: prop.c,v 1.14 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ void
 add_list(plr, head, op_sqr)
        int plr;
        OWN **head;
-       int op_sqr; 
+       int op_sqr;
 {
        int val;
        OWN *tp, *last_tp;

diff --git a/monop/trade.c b/monop/trade.c
index ef5d9f8058e80bdbf24ed52d226ae5e0465fb5d9..4317fe108bea2552389fc5e11e6d044114affeff 100644 (file)
--- a/monop/trade.c
+++ b/monop/trade.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: trade.c,v 1.10 2008/01/28 06:16:13 dholland Exp $      */
+/*     $NetBSD: trade.c,v 1.11 2008/02/19 09:45:02 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.10 2008/01/28 06:16:13 dholland Exp $");
+__RCSID("$NetBSD: trade.c,v 1.11 2008/02/19 09:45:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -103,7 +103,7 @@ over:
  */
 static void
 get_list(struct_no, play_no)
-       int struct_no, play_no; 
+       int struct_no, play_no;
 {
        int sn, pn;
        PLAY *pp;
@@ -156,7 +156,7 @@ once_more:
  */
 static int
 set_list(the_list)
-       OWN *the_list; 
+       OWN *the_list;
 {
        int i;
        OWN *op;
@@ -216,7 +216,7 @@ do_trade()
  */
 static void
 move_em(from, to)
-       TRADE *from, *to; 
+       TRADE *from, *to;
 {
        PLAY *pl_fr, *pl_to;
        OWN *op;