parse-options.c: move optname() earlier in the file

In preparation for making "optname" a static function move it above
its first user in parse-options.c.

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

diff --git a/parse-options.c b/parse-options.c
index e33700d6e7165066a0a5a47661c2a3a6c75eefe3..9e2da8383d7468c5c1f82e1003076a359a287701 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -22,6 +22,21 @@ int optbug(const struct option *opt, const char *reason)
        return error("BUG: switch '%c' %s", opt->short_name, reason);
 }
 
+const char *optname(const struct option *opt, int flags)
+{
+       static struct strbuf sb = STRBUF_INIT;
+
+       strbuf_reset(&sb);
+       if (flags & OPT_SHORT)
+               strbuf_addf(&sb, "switch `%c'", opt->short_name);
+       else if (flags & OPT_UNSET)
+               strbuf_addf(&sb, "option `no-%s'", opt->long_name);
+       else
+               strbuf_addf(&sb, "option `%s'", opt->long_name);
+
+       return sb.buf;
+}
+
 static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
                                     const struct option *opt,
                                     int flags, const char **arg)
@@ -1006,18 +1021,3 @@ void NORETURN usage_msg_opt(const char *msg,
        fprintf(stderr, "fatal: %s\n\n", msg);
        usage_with_options(usagestr, options);
 }
-
-const char *optname(const struct option *opt, int flags)
-{
-       static struct strbuf sb = STRBUF_INIT;
-
-       strbuf_reset(&sb);
-       if (flags & OPT_SHORT)
-               strbuf_addf(&sb, "switch `%c'", opt->short_name);
-       else if (flags & OPT_UNSET)
-               strbuf_addf(&sb, "option `no-%s'", opt->long_name);
-       else
-               strbuf_addf(&sb, "option `%s'", opt->long_name);
-
-       return sb.buf;
-}