From 9a853484082744d83e3c85a361be748d46003cc9 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sat, 10 Nov 2012 18:24:14 -0600 Subject: On 32 bit platforms %ld doesn't match uint64_t, so do long long and %lld (rather than deal with verbose PRIu64 nonsense). --- toys/posix/df.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toys/posix/df.c b/toys/posix/df.c index 0625946a..66e86b3b 100644 --- a/toys/posix/df.c +++ b/toys/posix/df.c @@ -49,7 +49,7 @@ GLOBALS( static void show_mt(struct mtab_list *mt) { int len; - uint64_t size, used, avail, percent, block; + long long size, used, avail, percent, block; char *device; // Return if it wasn't found (should never happen, but with /etc/mtab...) @@ -88,10 +88,10 @@ static void show_mt(struct mtab_list *mt) len = 25 - strlen(device); if (len < 1) len = 1; if (CFG_DF_PEDANTIC && (toys.optflags & FLAG_P)) { - xprintf("%s %ld %ld %ld %ld%% %s\n", device, size, used, avail, + xprintf("%s %lld %lld %lld %lld%% %s\n", device, size, used, avail, percent, mt->dir); } else { - xprintf("%s% *ld % 10ld % 9ld % 3ld%% %s\n", device, len, + xprintf("%s% *lld % 10lld % 9lld % 3lld%% %s\n", device, len, size, used, avail, percent, mt->dir); } -- cgit v1.2.3