summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-12-30 18:19:19 +0000
committermike <mike@FreeBSD.org>2002-12-30 18:19:19 +0000
commitb6add043f9fb96f224397cadcb342ededeb4bb60 (patch)
tree54ed6d6b8a53b244c01b9a3c8ad8db280d8b0d13
parentf773bc4c88a1c47c2f05d5be1a81b935e03d6271 (diff)
downloadFreeBSD-src-b6add043f9fb96f224397cadcb342ededeb4bb60.zip
FreeBSD-src-b6add043f9fb96f224397cadcb342ededeb4bb60.tar.gz
Back out rev 1.78; getbsize(3)'s original interface has been restored.
Approved by: markm
-rw-r--r--usr.sbin/pstat/pstat.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 3781994..f85de47 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -467,22 +467,21 @@ static int nswdev;
static void
print_swap_header(void)
{
- size_t hlen;
+ int hlen;
long blocksize;
const char *header;
header = getbsize(&hlen, &blocksize);
if (totalflag == 0)
(void)printf("%-15s %*s %8s %8s %8s %s\n",
- "Device", (int)hlen, header,
+ "Device", hlen, header,
"Used", "Avail", "Capacity", "Type");
}
static void
print_swap(struct kvm_swap *ksw)
{
- size_t hlen;
- int pagesize;
+ int hlen, pagesize;
long blocksize;
pagesize = getpagesize();
@@ -492,7 +491,7 @@ print_swap(struct kvm_swap *ksw)
++nswdev;
if (totalflag == 0) {
(void)printf("%-15s %*d ",
- ksw->ksw_devname, (int)hlen,
+ ksw->ksw_devname, hlen,
CONVERT(ksw->ksw_total));
(void)printf("%8d %8d %5.0f%% %s\n",
CONVERT(ksw->ksw_used),
@@ -506,8 +505,7 @@ print_swap(struct kvm_swap *ksw)
static void
print_swap_total(void)
{
- size_t hlen;
- int pagesize;
+ int hlen, pagesize;
long blocksize;
pagesize = getpagesize();
@@ -518,7 +516,7 @@ print_swap_total(void)
CONVERT(swtot.ksw_used), CONVERT(swtot.ksw_total));
} else if (nswdev > 1) {
(void)printf("%-15s %*d %8d %8d %5.0f%%\n",
- "Total", (int)hlen, CONVERT(swtot.ksw_total),
+ "Total", hlen, CONVERT(swtot.ksw_total),
CONVERT(swtot.ksw_used),
CONVERT(swtot.ksw_total - swtot.ksw_used),
(swtot.ksw_used * 100.0) / swtot.ksw_total);
OpenPOWER on IntegriCloud