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>

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 5be2b44d7d3646b57e246f26522ac0c187c15bae..b4630c54115cddee3a04dd51b88e4e425dd89bee 100644 (file)
--- 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);
 }
 
 /*

diff --git a/lib/at.c b/lib/at.c
index f8bfe1399992a9b09270b4b9e631b122d99e0dff..26f5ab95fa3583eaef8df277b393766885ac64a0 100644 (file)
--- a/lib/at.c
+++ b/lib/at.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
                printf("%32s ", d->d_name);
 
                if (fstat_at(dirfd(dir), dirname, d->d_name, &st, 0) == 0)
-                       printf("%16jd bytes ", st.st_size);
+                       printf("%16zd bytes ", st.st_size);
                else
                        printf("%16s bytes ", "???");
 

diff --git a/lib/strutils.c b/lib/strutils.c
index 30dc090b4f2cc5ccadc1ab9a80d303e319fa1bd6..ac59de8eed46997965b3c1465ba5e1de804a38fe 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -519,7 +519,7 @@ char *size_to_human_string(int options, uint64_t bytes)
 
                if (!dp || !*dp)
                        dp = ".";
-               snprintf(buf, sizeof(buf), "%d%s%jd%s", dec, dp, frac, suffix);
+               snprintf(buf, sizeof(buf), "%d%s%" PRIu64 "%s", dec, dp, frac, suffix);
        } else
                snprintf(buf, sizeof(buf), "%d%s", dec, suffix);
 

diff --git a/lib/sysfs.c b/lib/sysfs.c
index ade219eb946974378591ff5e14ea1083f37cf6a9..53aba3af94b6d3ab9a4c1615a70ee03f37767e3b 100644 (file)
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -462,7 +462,7 @@ int sysfs_write_u64(struct sysfs_cxt *cxt, const char *attr, uint64_t num)
        if (fd < 0)
                return -errno;
 
-       len = snprintf(buf, sizeof(buf), "%ju", num);
+       len = snprintf(buf, sizeof(buf), "%" PRIu64, num);
        if (len < 0 || (size_t) len + 1 > sizeof(buf))
                rc = -errno;
        else

diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 4d6099720944b1daf9dd87b10b32defbacd0c37b..f9a937cf5dd2aef82b348774b52ded3679f2d041 100644 (file)
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -312,8 +312,8 @@ try_again:
        if (state_fd >= 0) {
                rewind(state_f);
                len = fprintf(state_f,
-                             "clock: %04x tv: %016lu %08lu adj: %08d\n",
-                             clock_seq, last.tv_sec, last.tv_usec, adjustment);
+                             "clock: %04x tv: %016ld %08ld adj: %08d\n",
+                             clock_seq, (long)last.tv_sec, (long)last.tv_usec, adjustment);
                fflush(state_f);
                if (ftruncate(state_fd, len) < 0) {
                        fprintf(state_f, "                   \n");

diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c
index f25f5c90fe5acfd6cc0fa3e6d8532581ac240ca5..6991ecd5375b3a00bdf6dfefb46e9beb58489492 100644 (file)
--- a/libuuid/src/uuid_time.c
+++ b/libuuid/src/uuid_time.c
@@ -163,7 +163,7 @@ main(int argc, char **argv)
                printf("Warning: not a time-based UUID, so UUID time "
                       "decoding will likely not work!\n");
        }
-       printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, tv.tv_usec,
+       printf("UUID time is: (%ld, %ld): %s\n", (long)tv.tv_sec, (long)tv.tv_usec,
               ctime(&time_reg));
 
        return 0;

diff --git a/term-utils/script.c b/term-utils/script.c
index fcb5835848941341e82ff28cddbb2e357013c432..23ca89cdc8791d1b92f9dbf2c80121e902588420 100644 (file)
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -249,7 +249,8 @@ static void write_output(struct script_control *ctl, char *obuf,
 
                gettime_monotonic(&now);
                timersub(&now, &ctl->oldtime, &delta);
-               fprintf(ctl->timingfp, "%ld.%06ld %zd\n", delta.tv_sec, delta.tv_usec, bytes);
+               fprintf(ctl->timingfp, "%ld.%06ld %zd\n",
+                       (long)delta.tv_sec, (long)delta.tv_usec, bytes);
                if (ctl->flush)
                        fflush(ctl->timingfp);
                ctl->oldtime = now;