From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Mar 2012 14:17:49 +0000 (+0200)
Subject: wipefs: use strtosize_or_err()
X-Git-Tag: v2.22-rc1~602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99727496ed2117ec2965ab74fda2020fdac9994e;p=thirdparty%2Futil-linux.git

wipefs: use strtosize_or_err()

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

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 74de3a3a36..bd20997a15 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -346,16 +346,6 @@ do_wipe(struct wipe_desc *wp, const char *devname, int noact, int all, int quiet
 	return wp;
 }
 
-static loff_t
-strtoll_offset(const char *str)
-{
-	uintmax_t sz;
-
-	if (strtosize(str, &sz))
-		errx(EXIT_FAILURE, _("invalid offset value '%s' specified"), str);
-	return sz;
-}
-
 
 static void __attribute__((__noreturn__))
 usage(FILE *out)
@@ -414,7 +404,8 @@ main(int argc, char **argv)
 			noact++;
 			break;
 		case 'o':
-			wp0 = add_offset(wp0, strtoll_offset(optarg), 1);
+			wp0 = add_offset(wp0, strtosize_or_err(optarg,
+					 _("failed to parse offset")), 1);
 			has_offset++;
 			break;
 		case 'p':