mkfs: always explain why numeric inputs are invalid

[thirdparty/xfsprogs-dev.git] / mkfs / xfs_mkfs.c

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 6285b247f8a7c035303dc509b9dc1666784c08bc..f527476f559ff7ced7db5353a5a39fa3c82614b2 100644 (file)
--- 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;
 }