From: Karel Zak <kzak@redhat.com>
Date: Wed, 26 Oct 2016 08:28:41 +0000 (+0200)
Subject: fdisk: fix compiler warning
X-Git-Tag: v2.29~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4015b348f849774f5b1c50a3fc4f1e444597f6d;p=thirdparty%2Futil-linux.git

fdisk: fix compiler warning

disk-utils/fdisk-menu.c: In function ‘gpt_menu_cb’:
disk-utils/fdisk-menu.c:709: warning: passing argument 6 of ‘fdisk_ask_number’ from incompatible pointer type
./libfdisk/src/libfdisk.h:688: note: expected ‘uintmax_t *’ but argument is of type ‘long unsigned int *’

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index 6b61d32b1d..3ea5e3ddd3 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -692,7 +692,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
 	struct fdisk_partition *pa = NULL;
 	size_t n;
 	int rc = 0;
-	unsigned long length;
+	uintmax_t length = 0;
 
 	assert(cxt);
 	assert(ent);
@@ -709,7 +709,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
 	                                ~(uint32_t)0, _("New maximum entries"), &length);
 			if (rc)
 				return rc;
-			return fdisk_gpt_set_npartitions(cxt, length);
+			return fdisk_gpt_set_npartitions(cxt, (uint32_t) length);
 		case 'M':
 			mbr = fdisk_new_nested_context(cxt, "dos");
 			if (!mbr)