From dc474219b6cfded8ca837d28241f94c1bb350dc6 Mon Sep 17 00:00:00 2001 From: Mike Barcroft Date: Mon, 30 Dec 2002 18:10:37 +0000 Subject: [PATCH] Back out rev 1.44; getbsize(3)'s original interface has been restored. Approved by: markm --- bin/df/df.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/df/df.c b/bin/df/df.c index e4cd86eedd5..58a23204a27 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -381,8 +381,7 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int timesthrough; - static size_t headerlen; + static int headerlen, timesthrough; static const char *header; long used, availblks, inodes; @@ -393,7 +392,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, (int)headerlen); + mwp->total = imax(mwp->total, headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -442,7 +441,7 @@ static void update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - size_t dummy; + int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize);