summaryrefslogtreecommitdiff
path: root/ubi-utils/src/ubimkvol.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-08 17:58:55 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-09 17:49:22 +0300
commit924862c864da0b62cf93ba7abf2dc78a7e6ac48f (patch)
tree4d47039b5a095966b2551ffd9dfd0400fdbaeb55 /ubi-utils/src/ubimkvol.c
parentdd2a035dd6cb7408a99fac2052b6812e7f489de8 (diff)
mtd-utils: switch ubi and ubifs tools to use common strtoX funcs
Instead of using strtol and Co directly, use our share simple_strtoX() helpers. This is just a cleanup. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'ubi-utils/src/ubimkvol.c')
-rw-r--r--ubi-utils/src/ubimkvol.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/ubi-utils/src/ubimkvol.c b/ubi-utils/src/ubimkvol.c
index f6e498f..db71e2f 100644
--- a/ubi-utils/src/ubimkvol.c
+++ b/ubi-utils/src/ubimkvol.c
@@ -121,8 +121,7 @@ static int param_sanity_check(void)
static int parse_opt(int argc, char * const argv[])
{
while (1) {
- int key;
- char *endp;
+ int key, error = 1;
key = getopt_long(argc, argv, "a:n:N:s:S:t:h?Vm", long_options, NULL);
if (key == -1)
@@ -145,20 +144,20 @@ static int parse_opt(int argc, char * const argv[])
break;
case 'S':
- args.lebs = strtoull(optarg, &endp, 0);
- if (endp == optarg || args.lebs <= 0 || *endp != '\0')
+ args.lebs = simple_strtoull(optarg, &error);
+ if (error || args.lebs <= 0)
return errmsg("bad LEB count: \"%s\"", optarg);
break;
case 'a':
- args.alignment = strtoul(optarg, &endp, 0);
- if (*endp != '\0' || endp == optarg || args.alignment <= 0)
+ args.alignment = simple_strtoul(optarg, &error);
+ if (error || args.alignment <= 0)
return errmsg("bad volume alignment: \"%s\"", optarg);
break;
case 'n':
- args.vol_id = strtoul(optarg, &endp, 0);
- if (*endp != '\0' || endp == optarg || args.vol_id < 0)
+ args.vol_id = simple_strtoul(optarg, &error);
+ if (error || args.vol_id < 0)
return errmsg("bad volume ID: " "\"%s\"", optarg);
break;