From 7d25f65f268565c07ef094ff7d25fb5a36cd3b9d Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Fri, 2 Feb 2018 09:32:43 -0600 Subject: [PATCH] mkfs: always explain why numeric inputs are invalid Always explain why invalid numeric inputs are not valid, and in a complete sentence since that's what illegal_optio() sets us up for. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- mkfs/xfs_mkfs.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 6285b247f..f527476f5 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -1269,7 +1269,7 @@ illegal_option( fprintf(stderr, _("Invalid value %s for -%c %s option. %s\n"), value, opts->name, opts->subopts[index], - reason ? reason : ""); + reason); usage(); } @@ -1360,18 +1360,20 @@ getnum( c = strtoll(str, &str_end, 0); if (c == 0 && str_end == str) - illegal_option(str, opts, index, NULL); + illegal_option(str, opts, index, + _("Value not recognized as number.")); if (*str_end != '\0') - illegal_option(str, opts, index, NULL); + illegal_option(str, opts, index, + _("Unit suffixes are not allowed.")); } /* Validity check the result. */ if (c < sp->minval) - illegal_option(str, opts, index, _("value is too small")); + illegal_option(str, opts, index, _("Value is too small.")); else if (c > sp->maxval) - illegal_option(str, opts, index, _("value is too large")); + illegal_option(str, opts, index, _("Value is too large.")); if (sp->is_power_2 && !ispow2(c)) - illegal_option(str, opts, index, _("value must be a power of 2")); + illegal_option(str, opts, index, _("Value must be a power of 2.")); return c; } -- 2.47.2