diff options
| author | Ruediger Meier | 2016-02-09 18:08:56 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2016-02-11 13:39:56 +0100 |
| commit | 7231fb2a5b0b0ebf2be047a23a11ca43e786861b (patch) | |
| tree | 2467d1d110e0699a65a36636e173a132e1233751 /disk-utils/fsck.c | |
| parent | include: add missing includes (diff) | |
| download | kernel-qcow2-util-linux-7231fb2a5b0b0ebf2be047a23a11ca43e786861b.tar.gz kernel-qcow2-util-linux-7231fb2a5b0b0ebf2be047a23a11ca43e786861b.tar.xz kernel-qcow2-util-linux-7231fb2a5b0b0ebf2be047a23a11ca43e786861b.zip | |
misc: fix some printf format strings
Fix the warnings below for OSX clang and add a few more
casts for timeval:
lib/at.c:131:27: warning: format specifies type 'intmax_t' (aka 'long') but the argument has type 'off_t' (aka 'long long') [-Wformat]
printf("%16jd bytes ", st.st_size);
~~~~~ ^~~~~~~~~~
lib/strutils.c:522:52: warning: format specifies type 'intmax_t' (aka 'long') but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
snprintf(buf, sizeof(buf), "%d%s%jd%s", dec, dp, frac, suffix);
~~~ ^~~~
lib/sysfs.c:468:42: warning: format specifies type 'uintmax_t' (aka 'unsigned long') but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
len = snprintf(buf, sizeof(buf), "%ju", num);
~~~ ^~~
libuuid/src/gen_uuid.c:316:34: warning: format specifies type 'unsigned long' but the argument has type '__darwin_suseconds_t' (aka 'int') [-Wformat]
clock_seq, last.tv_sec, last.tv_usec, adjustment);
^~~~~~~~~~~~
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'disk-utils/fsck.c')
| -rw-r--r-- | disk-utils/fsck.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c index 5be2b44d7..b4630c541 100644 --- a/disk-utils/fsck.c +++ b/disk-utils/fsck.c @@ -591,26 +591,26 @@ static void print_stats(struct fsck_instance *inst) if (report_stats_file) fprintf(report_stats_file, "%s %d %ld " - "%ld.%06ld %d.%06d %d.%06d\n", + "%ld.%06ld %ld.%06ld %ld.%06ld\n", fs_get_device(inst->fs), inst->exit_status, inst->rusage.ru_maxrss, - delta.tv_sec, delta.tv_usec, - (int)inst->rusage.ru_utime.tv_sec, - (int)inst->rusage.ru_utime.tv_usec, - (int)inst->rusage.ru_stime.tv_sec, - (int)inst->rusage.ru_stime.tv_usec); + (long)delta.tv_sec, (long)delta.tv_usec, + (long)inst->rusage.ru_utime.tv_sec, + (long)inst->rusage.ru_utime.tv_usec, + (long)inst->rusage.ru_stime.tv_sec, + (long)inst->rusage.ru_stime.tv_usec); else fprintf(stdout, "%s: status %d, rss %ld, " - "real %ld.%06ld, user %d.%06d, sys %d.%06d\n", + "real %ld.%06ld, user %ld.%06ld, sys %ld.%06ld\n", fs_get_device(inst->fs), inst->exit_status, inst->rusage.ru_maxrss, - delta.tv_sec, delta.tv_usec, - (int)inst->rusage.ru_utime.tv_sec, - (int)inst->rusage.ru_utime.tv_usec, - (int)inst->rusage.ru_stime.tv_sec, - (int)inst->rusage.ru_stime.tv_usec); + (long)delta.tv_sec, (long)delta.tv_usec, + (long)inst->rusage.ru_utime.tv_sec, + (long)inst->rusage.ru_utime.tv_usec, + (long)inst->rusage.ru_stime.tv_sec, + (long)inst->rusage.ru_stime.tv_usec); } /* |