Signed-off-by: Jean-Noel Avila <jn.av...@free.fr>
---
 config.c | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/config.c b/config.c
index 584cacf..e33c703 100644
--- a/config.c
+++ b/config.c
@@ -655,43 +655,30 @@ static void die_bad_number(const char *name, const char 
*value)
        if (!value)
                value = "";
 
+       const char * error_type = (errno == ERANGE)? _("out of 
range"):_("invalid unit");
        if (!(cf && cf->name))
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s': out of range")
-                   : _("bad numeric config value '%s' for '%s': invalid unit"),
-                   value, name);
+               die(_("bad numeric config value '%s' for '%s': %s"),
+                   value, name, error_type);
 
        switch (cf->origin_type) {
        case CONFIG_ORIGIN_BLOB:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in blob %s: out 
of range")
-                   : _("bad numeric config value '%s' for '%s' in blob %s: 
invalid unit"),
-                   value, name, cf->name);
+               die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),
+                   value, name, cf->name, error_type);
        case CONFIG_ORIGIN_FILE:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in file %s: out 
of range")
-                   : _("bad numeric config value '%s' for '%s' in file %s: 
invalid unit"),
-                   value, name, cf->name);
+               die(_("bad numeric config value '%s' for '%s' in file %s: %s"),
+                   value, name, cf->name, error_type);
        case CONFIG_ORIGIN_STDIN:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in standard 
input: out of range")
-                   : _("bad numeric config value '%s' for '%s' in standard 
input: invalid unit"),
-                   value, name);
+               die(_("bad numeric config value '%s' for '%s' in standard 
input: %s"),
+                   value, name, error_type);
        case CONFIG_ORIGIN_SUBMODULE_BLOB:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in 
submodule-blob %s: out of range")
-                   : _("bad numeric config value '%s' for '%s' in 
submodule-blob %s: invalid unit"),
-                   value, name, cf->name);
+               die(_("bad numeric config value '%s' for '%s' in submodule-blob 
%s: %s"),
+                   value, name, cf->name, error_type);
        case CONFIG_ORIGIN_CMDLINE:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in command line 
%s: out of range")
-                   : _("bad numeric config value '%s' for '%s' in command line 
%s: invalid unit"),
-                   value, name, cf->name);
+               die(_("bad numeric config value '%s' for '%s' in command line 
%s: %s"),
+                   value, name, cf->name, error_type);
        default:
-               die(errno == ERANGE
-                   ? _("bad numeric config value '%s' for '%s' in %s: out of 
range")
-                   : _("bad numeric config value '%s' for '%s' in %s: invalid 
unit"),
-                   value, name, cf->name);
+               die(_("bad numeric config value '%s' for '%s' in %s: %s"),
+                   value, name, cf->name, error_type);
        }
 }
 
-- 
2.10.0.rc0.37.gd7d1c14.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to