]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'matching_formatters' of https://github.com/stoeckmann/util-linux
authorKarel Zak <kzak@redhat.com>
Tue, 7 Apr 2026 10:41:15 +0000 (12:41 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 7 Apr 2026 10:41:15 +0000 (12:41 +0200)
* 'matching_formatters' of https://github.com/stoeckmann/util-linux:
  Use correct formatters for given data types

1  2 
disk-utils/mkfs.minix.c
lib/pwdutils.c
libblkid/src/partitions/gpt.c
libblkid/src/partitions/partitions.c
libmount/src/fs.c
login-utils/su-common.c
sys-utils/losetup.c
sys-utils/unshare.c

Simple merge
diff --cc lib/pwdutils.c
Simple merge
index f977ed53acf41f3ca2bce7c99c7a1e04751487a4,26a89f9275c12414b08dcc8ac292b412f47943bc..bd588569d2d19c3ee64dbe666381eadd086f49c1
@@@ -380,10 -380,10 +380,10 @@@ static int probe_gpt_pt(blkid_probe pr
                        blkid_partlist_increment_partno(ls);
                        continue;
                }
 -              /* the partition has to inside usable range */
 +              /* the partition has to be inside usable range */
                if (start < fu || start + size - 1 > lu) {
                        DBG(LOWPROBE, ul_debug(
-                               "GPT entry[%d] overflows usable area - ignore",
+                               "GPT entry[%"PRIu32"] overflows usable area - ignore",
                                i));
                        blkid_partlist_increment_partno(ls);
                        continue;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge