From: Karel Zak <kzak@redhat.com>
Date: Tue, 15 May 2012 15:44:51 +0000 (+0200)
Subject: partx: cleanup strtoxx_or_err()
X-Git-Tag: v2.22-rc1~403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=659e5f5b5c2abce275d93bbf5a4eb416a1c6bb45;p=thirdparty%2Futil-linux.git

partx: cleanup strtoxx_or_err()

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

diff --git a/partx/addpart.c b/partx/addpart.c
index cd7e28ed75..0d814bf3ee 100644
--- a/partx/addpart.c
+++ b/partx/addpart.c
@@ -52,9 +52,9 @@ int main(int argc, char **argv)
 		err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
 
 	if (partx_add_partition(fd,
-			strtol_or_err(argv[2], _("failed to parse partition number")),
-			strtoll_or_err(argv[3],_("failed to parse start")),
-			strtoll_or_err(argv[4],_("failed to parse length"))))
+			strtou32_or_err(argv[2], _("invalid partition number argument")),
+			strtou64_or_err(argv[3], _("invalid start argument")),
+			strtou64_or_err(argv[4], _("invalid length argument"))))
 		err(EXIT_FAILURE, _("failed to add partition"));
 
 	return EXIT_SUCCESS;
diff --git a/partx/delpart.c b/partx/delpart.c
index eb5d99e998..79925db89b 100644
--- a/partx/delpart.c
+++ b/partx/delpart.c
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 		err(EXIT_FAILURE, _("%s: open failed"), argv[1]);
 
 	if (partx_del_partition(fd,
-			strtol_or_err(argv[2], _("failed to parse partition number"))))
+			strtou32_or_err(argv[2], _("invalid partition number argument"))))
 		err(EXIT_FAILURE, _("failed to remove partition"));
 
 	return EXIT_SUCCESS;
diff --git a/partx/partx.h b/partx/partx.h
index b40fa8fbd9..ed0fd0aa42 100644
--- a/partx/partx.h
+++ b/partx/partx.h
@@ -4,7 +4,7 @@
 #include <sys/ioctl.h>
 #include <linux/blkpg.h>
 
-static inline int partx_del_partition(int fd, int partno)
+static inline int partx_del_partition(int fd, unsigned int partno)
 {
 	struct blkpg_ioctl_arg a;
 	struct blkpg_partition p;
@@ -23,7 +23,7 @@ static inline int partx_del_partition(int fd, int partno)
 }
 
 static inline int partx_add_partition(int fd, int partno,
-			unsigned long start, unsigned long size)
+			uint64_t start, uint64_t size)
 {
 	struct blkpg_ioctl_arg a;
 	struct blkpg_partition p;