]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: fix warning, incompatible pointer types passing 'uint64_t *'
authorRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 22 Feb 2016 15:32:06 +0000 (16:32 +0100)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 29 Feb 2016 12:04:48 +0000 (13:04 +0100)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
disk-utils/fdisk.c
libfdisk/src/gpt.c

index 0b229839ede8a299ba128c4029b2900fbde8cb0d..2f95fe84a8e62ae3d31232fd4c8def3f816a0b05 100644 (file)
@@ -276,7 +276,7 @@ static int ask_offset(struct fdisk_context *cxt,
                snprintf(prompt, sizeof(prompt), _("%s (%ju-%ju): "), q, low, high);
 
        do {
-               uint64_t num = 0;
+               uintmax_t num = 0;
                char sig = 0, *p;
                int pwr = 0;
 
@@ -313,7 +313,7 @@ static int ask_offset(struct fdisk_context *cxt,
                if (num >= low && num <= high) {
                        if (sig && pwr)
                                fdisk_ask_number_set_relative(ask, 1);
-                       return fdisk_ask_number_set_result(ask, num);
+                       return fdisk_ask_number_set_result(ask, (uint64_t)num);
                }
                fdisk_warnx(cxt, _("Value out of range."));
        } while (1);
index f795b35a2617f28d752e243eb0015f94c3c3ab40..cd88df0e69c99d59d9439cd7646c54cc0fc5063c 100644 (file)
@@ -2564,7 +2564,8 @@ static int gpt_toggle_partition_flag(
                unsigned long flag)
 {
        struct fdisk_gpt_label *gpt;
-       uint64_t attrs, tmp;
+       uint64_t attrs;
+       uintmax_t tmp;
        char *bits;
        const char *name = NULL;
        int bit = -1, rc;