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

blkid: use strtosize_or_err()

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

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 1e8073eded..978661903b 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -41,6 +41,8 @@ extern int optind;
 #include <blkid.h>
 
 #include "ismounted.h"
+
+#define STRTOXX_EXIT_CODE	4		/* strtoxx_or_err() */
 #include "strutils.h"
 
 const char *progname = "blkid";
@@ -764,10 +766,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		case 'O':
-			if (strtosize(optarg, &offset))
-				fprintf(stderr,
-					"Invalid offset '%s' specified\n",
-					optarg);
+			offset = strtosize_or_err(optarg, "failed to parse offset");
 			break;
 		case 'p':
 			lowprobe |= LOWPROBE_SUPERBLOCKS;
@@ -781,10 +780,7 @@ int main(int argc, char **argv)
 			show[numtag] = NULL;
 			break;
 		case 'S':
-			if (strtosize(optarg, &size))
-				fprintf(stderr,
-					"Invalid size '%s' specified\n",
-					optarg);
+			size = strtosize_or_err(optarg, "failed to parse size");
 			break;
 		case 't':
 			if (search_type) {