From 5ec0096cd0ac9ab34239a6cfee1c44a9a6364290 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 24 Feb 2008 06:07:06 +0000 Subject: [PATCH] Fix a bit more lint. --- games/monop/monop.h | 4 ++-- games/monop/morg.c | 11 +++++------ games/monop/roll.c | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/games/monop/monop.h b/games/monop/monop.h index ad62ef623fce..bcbf97f782a0 100644 --- a/games/monop/monop.h +++ b/games/monop/monop.h @@ -1,4 +1,4 @@ -/* $NetBSD: monop.h,v 1.17 2008/02/24 03:01:13 dholland Exp $ */ +/* $NetBSD: monop.h,v 1.18 2008/02/24 06:07:06 dholland Exp $ */ /* * Copyright (c) 1980, 1993 @@ -67,7 +67,7 @@ #define lucky(str) printf("%s%s\n",str,lucky_mes[roll(1,num_luck)-1]) #define printline() printf("------------------------------\n") -#define sqnum(sqp) (sqp - board) +#define sqnum(sqp) ((short)(sqp - board)) struct sqr_st { /* structure for square */ const char *name; /* place name */ diff --git a/games/monop/morg.c b/games/monop/morg.c index e56ef7b0254e..cc93078196de 100644 --- a/games/monop/morg.c +++ b/games/monop/morg.c @@ -1,4 +1,4 @@ -/* $NetBSD: morg.c,v 1.17 2008/02/24 02:55:20 dholland Exp $ */ +/* $NetBSD: morg.c,v 1.18 2008/02/24 06:07:06 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.17 2008/02/24 02:55:20 dholland Exp $"); +__RCSID("$NetBSD: morg.c,v 1.18 2008/02/24 06:07:06 dholland Exp $"); #endif #endif /* not lint */ @@ -201,8 +201,7 @@ set_umlist() * This routine actually unmortgages the property */ static void -unm(propnum) - int propnum; +unm(int propnum) { int price; @@ -211,7 +210,7 @@ unm(propnum) price += price/10; printf("That cost you $%d\n",price); cur_p->money -= price; - set_umlist(); + (void)set_umlist(); } /* @@ -219,7 +218,7 @@ unm(propnum) * financial woes. It is fine to have $0 but not to be in debt. */ void -force_morg() +force_morg(void) { told_em = fixing = TRUE; while (cur_p->money < 0) { diff --git a/games/monop/roll.c b/games/monop/roll.c index 43f42fc1479e..ccae9d5af787 100644 --- a/games/monop/roll.c +++ b/games/monop/roll.c @@ -1,4 +1,4 @@ -/* $NetBSD: roll.c,v 1.12 2008/02/24 02:58:33 dholland Exp $ */ +/* $NetBSD: roll.c,v 1.13 2008/02/24 06:07:06 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.12 2008/02/24 02:58:33 dholland Exp $"); +__RCSID("$NetBSD: roll.c,v 1.13 2008/02/24 06:07:06 dholland Exp $"); #endif #endif /* not lint */ @@ -50,10 +50,10 @@ int roll(ndie, nsides) int ndie, nsides; { - int tot; + long tot; tot = 0; while (ndie--) tot += (random() % nsides) + 1; - return tot; + return (int)tot; }