printf() pedant - do not pass variable alone, use %s.

[bsdgames-darwin.git] / monop / print.c

diff --git a/monop/print.c b/monop/print.c
index eb49d1fc0f58f6b186179a372ebfad587a800774..5f0dcd22261949bb5d2ce13ba20a041d969efc3e 100644 (file)
--- a/monop/print.c
+++ b/monop/print.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $    */
+/*     $NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $    */
 
 /*
  * Copyright (c) 1980, 1993
@@ -33,25 +33,28 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)print.c    8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $";
+__RCSID("$NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $");
 #endif
 #endif /* not lint */
 
-# include      "monop.ext"
+#include "monop.ext"
 
-static char    buf[80],                /* output buffer                */
-               *header = "Name      Own      Price Mg # Rent";
+static const char *header = "Name      Own      Price Mg # Rent";
+
+static void printmorg __P((const SQUARE *));
 
 /*
  *     This routine prints out the current board
  */
-printboard() {
-
-       reg int i;
+void
+printboard() 
+{
+       int i;
 
        printf("%s\t%s\n", header, header);
        for (i = 0; i < N_SQRS/2; i++) {
@@ -60,13 +63,14 @@ printboard() {
                printsq(i+N_SQRS/2, TRUE);
        }
 }
+
 /*
  *     This routine lists where each player is.
  */
-where() {
-
-       reg int i;
-       char    *bsp;
+void
+where() 
+{
+       int i;
 
        printf("%s Player\n", header);
        for (i = 0; i < num_play; i++) {
@@ -77,17 +81,18 @@ where() {
                putchar('\n');
        }
 }
+
 /*
  *     This routine prints out an individual square
  */
+void
 printsq(sqn, eoln)
-int            sqn;
-reg bool       eoln; {
-
-       reg int         rnt;
-       reg PROP        *pp;
-       reg SQUARE      *sqp;
-       int             i;
+       int sqn;
+       bool eoln;
+{
+       int rnt;
+       PROP *pp;
+       SQUARE *sqp;
 
        sqp = &board[sqn];
        printf("%-10.10s", sqp->name);
@@ -99,7 +104,6 @@ reg bool     eoln; {
          case GOTO_J:
          case LUX_TAX:
          case IN_JAIL:
-spec:
                if (!eoln)
                        printf("                        ");
                break;
@@ -151,36 +155,40 @@ spec:
                printmorg(sqp);
                rnt = 25;
                rnt <<= play[sqp->owner].num_rr - 1;
-               printf("%d %4d", play[sqp->owner].num_rr, 25 << (play[sqp->owner].num_rr - 1));
+               printf("%d %4d", play[sqp->owner].num_rr,
+                   25 << (play[sqp->owner].num_rr - 1));
                break;
        }
        if (eoln)
                putchar('\n');
 }
+
 /*
  *     This routine prints out the mortgage flag.
  */
+static void
 printmorg(sqp)
-reg SQUARE     *sqp; {
-
+       const SQUARE *sqp;
+{
        if (sqp->desc->morg)
                printf(" * ");
        else
                printf("   ");
 }
+
 /*
  *     This routine lists the holdings of the player given
  */
+void
 printhold(pl)
-reg int        pl; {
-
-       reg OWN         *op;
-       reg PLAY        *pp;
-       char            *bsp;
+       int pl;
+{
+       OWN *op;
+       PLAY *pp;
 
        pp = &play[pl];
-       printf("%s's (%d) holdings (Total worth: $%d):\n", name_list[pl], pl+1,
-               pp->money + prop_worth(pp));
+       printf("%s's (%d) holdings (Total worth: $%d):\n", name_list[pl],
+           pl + 1, pp->money + prop_worth(pp));
        printf("\t$%d", pp->money);
        if (pp->num_gojf) {
                printf(", %d get-out-of-jail-free card", pp->num_gojf);