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

hexdump: use strtosize_or_err()

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

diff --git a/text-utils/hexsyntax.c b/text-utils/hexsyntax.c
index 19bb76b0b2..5f3b7338c3 100644
--- a/text-utils/hexsyntax.c
+++ b/text-utils/hexsyntax.c
@@ -54,7 +54,6 @@ newsyntax(int argc, char ***argvp)
 {
 	int ch;
 	char **argv;
-	uintmax_t o;
 
 	argv = *argvp;
 	while ((ch = getopt(argc, argv, "bcCde:f:n:os:vxV")) != -1) {
@@ -83,20 +82,14 @@ newsyntax(int argc, char ***argvp)
 			addfile(optarg);
 			break;
 		case 'n':
-			if (strtosize(optarg, &o))
-				errx(EXIT_FAILURE,
-				     _("invalid length value '%s' specified"), optarg);
-			length = o;
+			length = strtosize_or_err(optarg, _("failed to parse length"));
 			break;
 		case 'o':
 			add("\"%07.7_Ax\n\"");
 			add("\"%07.7_ax \" 8/2 \" %06o \" \"\\n\"");
 			break;
 		case 's':
-			if (strtosize(optarg, &o))
-				errx(EXIT_FAILURE,
-				     _("invalid skip value '%s' specified"), optarg);
-			skip = o;
+			skip = strtosize_or_err(optarg, _("failed to parse offset"));
 			break;
 		case 'v':
 			vflag = ALL;