Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Fix arguments to *printw().
details: https://anonhg.NetBSD.org/src/rev/3311e87cc54f
branches: trunk
changeset: 485400:3311e87cc54f
user: jdc <jdc%NetBSD.org@localhost>
date: Thu Apr 27 00:30:51 2000 +0000
description:
Fix arguments to *printw().
diffstat:
games/canfield/canfield/canfield.c | 23 ++++++++++++-----------
games/mille/print.c | 6 +++---
games/phantasia/fight.c | 4 ++--
games/phantasia/misc.c | 4 ++--
games/robots/score.c | 6 +++---
usr.bin/systat/bufcache.c | 8 ++++----
usr.bin/systat/netcmds.c | 6 +++---
usr.bin/systat/netstat.c | 8 ++++----
usr.bin/systat/tcp.c | 6 +++---
9 files changed, 36 insertions(+), 35 deletions(-)
diffs (262 lines):
diff -r 22d29ebb7577 -r 3311e87cc54f games/canfield/canfield/canfield.c
--- a/games/canfield/canfield/canfield.c Thu Apr 27 00:28:58 2000 +0000
+++ b/games/canfield/canfield/canfield.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: canfield.c,v 1.15 1999/09/12 09:02:20 jsm Exp $ */
+/* $NetBSD: canfield.c,v 1.16 2000/04/27 00:30:52 jdc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: canfield.c,v 1.15 1999/09/12 09:02:20 jsm Exp $");
+__RCSID("$NetBSD: canfield.c,v 1.16 2000/04/27 00:30:52 jdc Exp $");
#endif
#endif /* not lint */
@@ -1167,24 +1167,25 @@
if (status != BETTINGBOX)
return;
move(tboxrow + 2, boxcol + 13);
- printw("%4d%8d%9d", this.hand, game.hand, total.hand);
+ printw("%4ld%8ld%9ld", this.hand, game.hand, total.hand);
move(tboxrow + 3, boxcol + 13);
- printw("%4d%8d%9d", this.inspection, game.inspection, total.inspection);
+ printw("%4ld%8ld%9ld", this.inspection, game.inspection,
+ total.inspection);
move(tboxrow + 4, boxcol + 13);
- printw("%4d%8d%9d", this.game, game.game, total.game);
+ printw("%4ld%8ld%9ld", this.game, game.game, total.game);
move(tboxrow + 5, boxcol + 13);
- printw("%4d%8d%9d", this.runs, game.runs, total.runs);
+ printw("%4ld%8ld%9ld", this.runs, game.runs, total.runs);
move(tboxrow + 6, boxcol + 13);
- printw("%4d%8d%9d", this.information, game.information,
+ printw("%4ld%8ld%9ld", this.information, game.information,
total.information);
move(tboxrow + 7, boxcol + 13);
- printw("%4d%8d%9d", this.thinktime, game.thinktime, total.thinktime);
+ printw("%4ld%8ld%9ld", this.thinktime, game.thinktime, total.thinktime);
move(tboxrow + 8, boxcol + 13);
- printw("%4d%8d%9d", thiscosts, gamecosts, totalcosts);
+ printw("%4ld%8ld%9ld", thiscosts, gamecosts, totalcosts);
move(tboxrow + 9, boxcol + 13);
- printw("%4d%8d%9d", this.wins, game.wins, total.wins);
+ printw("%4ld%8ld%9ld", this.wins, game.wins, total.wins);
move(tboxrow + 10, boxcol + 13);
- printw("%4d%8d%9d", this.worth, game.worth, total.worth);
+ printw("%4ld%8ld%9ld", this.worth, game.worth, total.worth);
move(tboxrow + 11, boxcol + 13);
printw("%4.0f%%%7.1f%%%8.1f%%", thisreturn, gamereturn, totalreturn);
}
diff -r 22d29ebb7577 -r 3311e87cc54f games/mille/print.c
--- a/games/mille/print.c Thu Apr 27 00:28:58 2000 +0000
+++ b/games/mille/print.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.8 1999/09/08 21:45:28 jsm Exp $ */
+/* $NetBSD: print.c,v 1.9 2000/04/27 00:30:52 jdc Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: print.c,v 1.8 1999/09/08 21:45:28 jsm Exp $");
+__RCSID("$NetBSD: print.c,v 1.9 2000/04/27 00:30:52 jdc Exp $");
#endif
#endif /* not lint */
@@ -89,7 +89,7 @@
pp = &Player[PLAYER];
for (i = 0; i < HAND_SZ; i++)
show_card(i + 6, temp, pp->hand[i], &pp->sh_hand[i]);
- mvprintw(6, COMP_STRT + CARD_STRT, "%2d", Topcard - Deck);
+ mvprintw(6, COMP_STRT + CARD_STRT, "%2ld", Topcard - Deck);
show_card(8, COMP_STRT + CARD_STRT, Discard, &Sh_discard);
if (End == 1000) {
move(EXT_Y, EXT_X);
diff -r 22d29ebb7577 -r 3311e87cc54f games/phantasia/fight.c
--- a/games/phantasia/fight.c Thu Apr 27 00:28:58 2000 +0000
+++ b/games/phantasia/fight.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fight.c,v 1.6 2000/03/30 11:01:13 jdolecek Exp $ */
+/* $NetBSD: fight.c,v 1.7 2000/04/27 00:30:53 jdc Exp $ */
/*
* fight.c Phantasia monster fighting routines
@@ -396,7 +396,7 @@
/* takes some of the player's strength */
inflict = ROLL(1.0, (Circle - 1.0) / 2.0);
inflict = MIN(Player.p_strength, inflict);
- mvprintw(Lines++, 0, "%s sapped %0.f of your strength!",
+ mvprintw(Lines++, 0, "%s sapped %.0f of your strength!",
Enemyname, inflict);
Player.p_strength -= inflict;
Player.p_might -= inflict;
diff -r 22d29ebb7577 -r 3311e87cc54f games/phantasia/misc.c
--- a/games/phantasia/misc.c Thu Apr 27 00:28:58 2000 +0000
+++ b/games/phantasia/misc.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.6 1999/09/08 21:57:19 jsm Exp $ */
+/* $NetBSD: misc.c,v 1.7 2000/04/27 00:30:53 jdc Exp $ */
/*
* misc.c Phantasia miscellaneous support routines
@@ -426,7 +426,7 @@
mvprintw(13, 0, "Sin : %9.5f", Player.p_sin);
mvprintw(14, 0, "Poison : %9.5f", Player.p_poison);
mvprintw(15, 0, "Gems : %9.0f", Player.p_gems);
- mvprintw(16, 0, "Age : %9d", Player.p_age);
+ mvprintw(16, 0, "Age : %9ld", Player.p_age);
mvprintw(10, 40, "Holy Water: %9d", Player.p_holywater);
mvprintw(11, 40, "Amulets : %9d", Player.p_amulets);
mvprintw(12, 40, "Charms : %9d", Player.p_charms);
diff -r 22d29ebb7577 -r 3311e87cc54f games/robots/score.c
--- a/games/robots/score.c Thu Apr 27 00:28:58 2000 +0000
+++ b/games/robots/score.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $ */
+/* $NetBSD: score.c,v 1.14 2000/04/27 00:30:53 jdc Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: score.c,v 1.13 2000/04/09 23:02:52 mycroft Exp $");
+__RCSID("$NetBSD: score.c,v 1.14 2000/04/27 00:30:53 jdc Exp $");
#endif
#endif /* not lint */
@@ -175,7 +175,7 @@
move((scp - Top) + 2, 15);
if (!done_show && scp->s_uid == uid && scp->s_score == Score)
standout();
- printw("%5d %5d %-8.8s %-9.9s %5d",
+ printw("%5ld %5d %-8.8s %-9.9s %5d",
(scp - Top) + 1, scp->s_score, scp->s_name,
scp->s_auto ? "(autobot)" : "", scp->s_level);
if (!done_show && scp->s_uid == uid && scp->s_score == Score) {
diff -r 22d29ebb7577 -r 3311e87cc54f usr.bin/systat/bufcache.c
--- a/usr.bin/systat/bufcache.c Thu Apr 27 00:28:58 2000 +0000
+++ b/usr.bin/systat/bufcache.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bufcache.c,v 1.6 2000/02/14 05:35:21 soren Exp $ */
+/* $NetBSD: bufcache.c,v 1.7 2000/04/27 00:30:51 jdc Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: bufcache.c,v 1.6 2000/02/14 05:35:21 soren Exp $");
+__RCSID("$NetBSD: bufcache.c,v 1.7 2000/04/27 00:30:51 jdc Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -162,7 +162,7 @@
mvwprintw(wnd, i, 0, "%-20.20s", ml->ml_addr == NULL ?
"NULL" : ml->ml_mount.mnt_stat.f_mntonname);
wprintw(wnd,
- " %6d %3d %8ld %3d %8ld %3d %3d",
+ " %6d %3d %8ld %3ld %8ld %3ld %3ld",
ml->ml_count, (100 * ml->ml_count) / nbuf,
ml->ml_valid, (100 * ml->ml_valid) / bufkb,
ml->ml_size, (100 * ml->ml_size) / bufkb,
@@ -179,7 +179,7 @@
wclrtobot(wnd);
mvwprintw(wnd, lastrow + 2, 0,
- "%-20s %6d %3d %8d %3d %8d %3d %3d",
+ "%-20s %6d %3d %8ld %3ld %8ld %3ld %3ld",
"Total:", tbuf, (100 * tbuf) / nbuf,
tvalid, (100 * tvalid) / bufkb,
tsize, (100 * tsize) / bufkb, (100 * tvalid) / tsize);
diff -r 22d29ebb7577 -r 3311e87cc54f usr.bin/systat/netcmds.c
--- a/usr.bin/systat/netcmds.c Thu Apr 27 00:28:58 2000 +0000
+++ b/usr.bin/systat/netcmds.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netcmds.c,v 1.14 2000/01/05 11:59:12 itojun Exp $ */
+/* $NetBSD: netcmds.c,v 1.15 2000/04/27 00:30:51 jdc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netcmds.c,v 1.14 2000/01/05 11:59:12 itojun Exp $");
+__RCSID("$NetBSD: netcmds.c,v 1.15 2000/04/27 00:30:51 jdc Exp $");
#endif /* not lint */
/*
@@ -292,7 +292,7 @@
if (sp)
printw("%s ", sp->s_name);
else
- printw("%d ", p->port);
+ printw("%ld ", p->port);
}
}
diff -r 22d29ebb7577 -r 3311e87cc54f usr.bin/systat/netstat.c
--- a/usr.bin/systat/netstat.c Thu Apr 27 00:28:58 2000 +0000
+++ b/usr.bin/systat/netstat.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.c,v 1.17 2000/01/10 21:06:16 itojun Exp $ */
+/* $NetBSD: netstat.c,v 1.18 2000/04/27 00:30:51 jdc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: netstat.c,v 1.17 2000/01/10 21:06:16 itojun Exp $");
+__RCSID("$NetBSD: netstat.c,v 1.18 2000/04/27 00:30:51 jdc Exp $");
#endif /* not lint */
/*
@@ -516,8 +516,8 @@
if (p->ni_family == AF_INET6)
waddstr(wnd, "6");
#endif
- mvwprintw(wnd, p->ni_line, RCVCC, "%6d", p->ni_rcvcc);
- mvwprintw(wnd, p->ni_line, SNDCC, "%6d", p->ni_sndcc);
+ mvwprintw(wnd, p->ni_line, RCVCC, "%6ld", p->ni_rcvcc);
+ mvwprintw(wnd, p->ni_line, SNDCC, "%6ld", p->ni_sndcc);
if (streq(p->ni_proto, "tcp")) {
if (p->ni_state < 0 || p->ni_state >= TCP_NSTATES)
mvwprintw(wnd, p->ni_line, STATE, "%d",
diff -r 22d29ebb7577 -r 3311e87cc54f usr.bin/systat/tcp.c
--- a/usr.bin/systat/tcp.c Thu Apr 27 00:28:58 2000 +0000
+++ b/usr.bin/systat/tcp.c Thu Apr 27 00:30:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp.c,v 1.3 2000/01/13 12:39:05 ad Exp $ */
+/* $NetBSD: tcp.c,v 1.4 2000/04/27 00:30:51 jdc Exp $ */
/*
* Copyright (c) 1999 Andy Doran <ad%NetBSD.org@localhost>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: tcp.c,v 1.3 2000/01/13 12:39:05 ad Exp $");
+__RCSID("$NetBSD: tcp.c,v 1.4 2000/04/27 00:30:51 jdc Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -58,7 +58,7 @@
#define LHD(row, str) mvwprintw(wnd, row, 10, str)
#define RHD(row, str) mvwprintw(wnd, row, 45, str)
-#define SHOW(row, col, stat) mvwprintw(wnd, row, col, "%9lu", curstat.stat)
+#define SHOW(row, col, stat) mvwprintw(wnd, row, col, "%9qu", curstat.stat)
static struct tcpstat curstat, oldstat;
Home |
Main Index |
Thread Index |
Old Index