提交 078fe305 编写于 作者: J Jean-Noel Avila 提交者: Junio C Hamano

i18n: simplify numeric error reporting

Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 8aa6dc1d
......@@ -652,46 +652,34 @@ int git_parse_ulong(const char *value, unsigned long *ret)
NORETURN
static void die_bad_number(const char *name, const char *value)
{
const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
if (!value)
value = "";
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);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册