config.c: refactor die_bad_number() to not call gettext() early

Prepare die_bad_number() for a change to specially handle
GIT_TEST_GETTEXT_POISON calling git_env_bool() by making
die_bad_number() not call gettext() early, which would in turn call
git_env_bool().

There's no meaningful change here yet, just a re-arrangement of the
current code to make that subsequent change easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.c b/config.c
index 296a6d9cc4110bd7fcef542ac9cc9cfe04d4f4d4..374cb33005007fb2d9f4d15ea21dbd39e4219e4e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -949,34 +949,35 @@ int git_parse_ssize_t(const char *value, ssize_t *ret)
 NORETURN
 static void die_bad_number(const char *name, const char *value)
 {
 NORETURN
 static void die_bad_number(const char *name, const char *value)
 {

-       const char * error_type = (errno == ERANGE)? _("out of range"):_("invalid unit");
+       const char *error_type = (errno == ERANGE) ?
+               N_("out of range") : N_("invalid unit");
+       const char *bad_numeric = N_("bad numeric config value '%s' for '%s': %s");

 
        if (!value)
                value = "";
 
        if (!(cf && cf->name))
 
        if (!value)
                value = "";
 
        if (!(cf && cf->name))

-               die(_("bad numeric config value '%s' for '%s': %s"),
-                   value, name, error_type);
+               die(_(bad_numeric), value, name, _(error_type));

 
        switch (cf->origin_type) {
        case CONFIG_ORIGIN_BLOB:
                die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),
 
        switch (cf->origin_type) {
        case CONFIG_ORIGIN_BLOB:
                die(_("bad numeric config value '%s' for '%s' in blob %s: %s"),

-                   value, name, cf->name, error_type);
+                   value, name, cf->name, _(error_type));

        case CONFIG_ORIGIN_FILE:
                die(_("bad numeric config value '%s' for '%s' in file %s: %s"),
        case CONFIG_ORIGIN_FILE:
                die(_("bad numeric config value '%s' for '%s' in file %s: %s"),

-                   value, name, cf->name, error_type);
+                   value, name, cf->name, _(error_type));

        case CONFIG_ORIGIN_STDIN:
                die(_("bad numeric config value '%s' for '%s' in standard input: %s"),
        case CONFIG_ORIGIN_STDIN:
                die(_("bad numeric config value '%s' for '%s' in standard input: %s"),

-                   value, name, error_type);
+                   value, name, _(error_type));

        case CONFIG_ORIGIN_SUBMODULE_BLOB:
                die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"),
        case CONFIG_ORIGIN_SUBMODULE_BLOB:
                die(_("bad numeric config value '%s' for '%s' in submodule-blob %s: %s"),

-                   value, name, cf->name, error_type);
+                   value, name, cf->name, _(error_type));

        case CONFIG_ORIGIN_CMDLINE:
                die(_("bad numeric config value '%s' for '%s' in command line %s: %s"),
        case CONFIG_ORIGIN_CMDLINE:
                die(_("bad numeric config value '%s' for '%s' in command line %s: %s"),

-                   value, name, cf->name, error_type);
+                   value, name, cf->name, _(error_type));

        default:
                die(_("bad numeric config value '%s' for '%s' in %s: %s"),
        default:
                die(_("bad numeric config value '%s' for '%s' in %s: %s"),

-                   value, name, cf->name, error_type);
+                   value, name, cf->name, _(error_type));

        }
 }
 
        }
 }