mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Back out rev 1.78; getbsize(3)'s original interface has been restored.

Browse Source 
Approved by:	markm
This commit is contained in:
Mike Barcroft 2002-12-30 18:19:19 +00:00
parent 591871e5cb
commit c48205f332
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=108457
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.sbin/pstat/pstat.c
View File

@ -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);