libfdisk: use fdisk_sector_t consistently and fix printf format strings

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/libfdisk/samples/mkpart-fullspec.c b/libfdisk/samples/mkpart-fullspec.c
index 041bf2cec0622fded1ee3e71aa4c1c23d7a778e4..e919c545fbffc08a9fa5047bad24bace7c1ef03a 100644 (file)
--- 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: <partno=%zu,start=%ju,size=%ju>\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 54418cd90c4c7a00e084be45d9b8e9d57d1a602a..eea02dba86138db2def196f3bf67ea5191c0b8a7 100644 (file)
--- 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);