]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
misc: once again some printf format strings
authorRuediger Meier <ruediger.meier@ga-group.nl>
Wed, 26 Oct 2016 21:04:44 +0000 (23:04 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Thu, 27 Oct 2016 09:03:27 +0000 (11:03 +0200)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
libblkid/src/probe.c
libblkid/src/superblocks/zfs.c
libfdisk/src/item.c

index da6720daee66ea0af9209d3ce386b9dcfbbc6153..ea50f5a6b31d43b9cbc341ae2355926f5955141f 100644 (file)
@@ -756,7 +756,7 @@ static int is_sector_readable(int fd, uint64_t sector)
 
        return 1;
 failed:
-       DBG(LOWPROBE, ul_debug("CDROM: read sector %ju failed %m", sector));
+       DBG(LOWPROBE, ul_debug("CDROM: read sector %"PRIu64" failed %m", sector));
        errno = 0;
        return 0;
 }
index c41f769905b6e9e84a6239d3c0033d4e2ae4b56b..02fa95675e75a12ba9fb7e55c3f5f2030bd3c528 100644 (file)
@@ -87,7 +87,7 @@ static void zfs_extract_guid_name(blkid_probe pr, loff_t offset)
        memcpy(buff, p, sizeof(buff));
        nvl = (struct nvlist *) buff;
 
-       DBG(LOWPROBE, ul_debug("zfs_extract: nvlist offset %jd\n", offset));
+       DBG(LOWPROBE, ul_debug("zfs_extract: nvlist offset %jd\n", (intmax_t)offset));
 
        nvp = &nvl->nvl_nvpair;
        while (left > sizeof(*nvp) && nvp->nvp_size != 0 && found < 3) {
@@ -176,14 +176,14 @@ static int find_uberblocks(const void *label, loff_t *ub_offset, int *swap_endia
                        *ub_offset = offset;
                        *swap_endian = 0;
                        found++;
-                       DBG(LOWPROBE, ul_debug("probe_zfs: found little-endian uberblock at %jd\n", offset >> 10));
+                       DBG(LOWPROBE, ul_debug("probe_zfs: found little-endian uberblock at %jd\n", (intmax_t)offset >> 10));
                }
 
                if (ub->ub_magic == swab_magic) {
                        *ub_offset = offset;
                        *swap_endian = 1;
                        found++;
-                       DBG(LOWPROBE, ul_debug("probe_zfs: found big-endian uberblock at %jd\n", offset >> 10));
+                       DBG(LOWPROBE, ul_debug("probe_zfs: found big-endian uberblock at %jd\n", (intmax_t)offset >> 10));
                }
        }
 
index 31637a1f1df5399fbef8566bdd9e362f872339fc..6c98228f4940a6c7d43148fa66275c259a35c4e5 100644 (file)
@@ -1,4 +1,6 @@
 
+#include <inttypes.h>
+
 #include "fdiskP.h"
 
 /**
@@ -219,7 +221,7 @@ static int test_listitems(struct fdisk_test *ts, int argc, char *argv[])
                            && fdisk_labelitem_get_data_string(item, &str) == 0)
                                printf("%s: %s\n", name, str);
                        else if (fdisk_labelitem_get_data_u64(item, &num) == 0)
-                               printf("%s: %ju\n", name, num);
+                               printf("%s: %"PRIu64"\n", name, num);
                        break;
                }
                case 1: /* item unsuported by label -- ignore */