]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fsck: fix time_t=long assumptions
authorKarel Zak <kzak@redhat.com>
Thu, 6 May 2021 08:13:27 +0000 (10:13 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 6 May 2021 08:40:32 +0000 (10:40 +0200)
References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>
disk-utils/fsck.c

index ec0e374a04fcbb2a330fdc8e4e1b5b7de2143f97..fe114d729889872689404b3565a10c15b4321ea7 100644 (file)
@@ -597,27 +597,31 @@ static void print_stats(struct fsck_instance *inst)
        timersub(&inst->end_time, &inst->start_time, &delta);
 
        if (report_stats_file)
-               fprintf(report_stats_file, "%s %d %ld "
-                                          "%ld.%06ld %ld.%06ld %ld.%06ld\n",
+               fprintf(report_stats_file, "%s %d %ld"
+                                  " %"PRId64".%06"PRId64
+                                  " %"PRId64".%06"PRId64
+                                  " %"PRId64".%06"PRId64"\n",
                        fs_get_device(inst->fs),
                        inst->exit_status,
                        inst->rusage.ru_maxrss,
-                       (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);
+                       (int64_t)delta.tv_sec, (int64_t)delta.tv_usec,
+                       (int64_t)inst->rusage.ru_utime.tv_sec,
+                       (int64_t)inst->rusage.ru_utime.tv_usec,
+                       (int64_t)inst->rusage.ru_stime.tv_sec,
+                       (int64_t)inst->rusage.ru_stime.tv_usec);
        else
                fprintf(stdout, "%s: status %d, rss %ld, "
-                               "real %ld.%06ld, user %ld.%06ld, sys %ld.%06ld\n",
+                               "real %"PRId64".%06"PRId64", "
+                               "user %"PRId64".%06"PRId64", "
+                               "sys %"PRId64".%06"PRId64"\n",
                        fs_get_device(inst->fs),
                        inst->exit_status,
                        inst->rusage.ru_maxrss,
-                       (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);
+                       (int64_t)delta.tv_sec, (int64_t)delta.tv_usec,
+                       (int64_t)inst->rusage.ru_utime.tv_sec,
+                       (int64_t)inst->rusage.ru_utime.tv_usec,
+                       (int64_t)inst->rusage.ru_stime.tv_sec,
+                       (int64_t)inst->rusage.ru_stime.tv_usec);
 }
 
 /*