From: Ruediger Meier Date: Thu, 13 Jul 2017 18:00:03 +0000 (+0200) Subject: libfdisk: use fdisk_sector_t consistently and fix printf format strings X-Git-Tag: v2.31-rc1~190 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac6a6b0d3cd34fc99c6575cb4155a83c6ed8b2b7;p=thirdparty%2Futil-linux.git libfdisk: use fdisk_sector_t consistently and fix printf format strings Signed-off-by: Ruediger Meier --- diff --git a/libfdisk/samples/mkpart-fullspec.c b/libfdisk/samples/mkpart-fullspec.c index 041bf2cec0..e919c545fb 100644 --- a/libfdisk/samples/mkpart-fullspec.c +++ b/libfdisk/samples/mkpart-fullspec.c @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) uint64_t start = 0, size = 0; const char *str = argv[optind]; - if (sscanf(str, "%u,%ju,%ju", &partno, &start, &size) != 3) + if (sscanf(str, "%u,%"SCNu64",%"SCNu64"", &partno, &start, &size) != 3) errx(EXIT_FAILURE, "faild to parse %s", str); /* disable defaults */ @@ -132,8 +132,8 @@ int main(int argc, char *argv[]) fprintf(stderr, "Requested partition: \n", fdisk_partition_get_partno(pa), - fdisk_partition_get_start(pa), - fdisk_partition_get_size(pa)); + (uintmax_t) fdisk_partition_get_start(pa), + (uintmax_t) fdisk_partition_get_size(pa)); if (fdisk_is_label(cxt, DOS)) { /* Make sure last primary partition is extended if user diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in index 54418cd90c..eea02dba86 100644 --- a/libfdisk/src/libfdisk.h.in +++ b/libfdisk/src/libfdisk.h.in @@ -391,7 +391,7 @@ extern int fdisk_partition_is_freespace(struct fdisk_partition *pa); int fdisk_partition_set_start(struct fdisk_partition *pa, uint64_t off); int fdisk_partition_unset_start(struct fdisk_partition *pa); -uint64_t fdisk_partition_get_start(struct fdisk_partition *pa); +fdisk_sector_t fdisk_partition_get_start(struct fdisk_partition *pa); int fdisk_partition_has_start(struct fdisk_partition *pa); int fdisk_partition_cmp_start(struct fdisk_partition *a, struct fdisk_partition *b); @@ -400,7 +400,7 @@ int fdisk_partition_start_is_default(struct fdisk_partition *pa); int fdisk_partition_set_size(struct fdisk_partition *pa, uint64_t sz); int fdisk_partition_unset_size(struct fdisk_partition *pa); -uint64_t fdisk_partition_get_size(struct fdisk_partition *pa); +fdisk_sector_t fdisk_partition_get_size(struct fdisk_partition *pa); int fdisk_partition_has_size(struct fdisk_partition *pa); int fdisk_partition_size_explicit(struct fdisk_partition *pa, int enable);