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>
Ævar Arnfjörð Bjarmason committed
Oct 8, 2021 at 21:07 UTC
3c2047a711a47fbaf0b20d8f9a551c764a6c3f34
1 file changed
+15
-15
parse-options.c
+15
-15
@@ -22,6 +22,21 @@ int optbug(const struct option *opt, const char *reason)
22
return error("BUG: switch '%c' %s", opt->short_name, reason);
23
}
24
25
+const char *optname(const struct option *opt, int flags)
26
+{
27
+ static struct strbuf sb = STRBUF_INIT;
28
+
29
+ strbuf_reset(&sb);
30
+ if (flags & OPT_SHORT)
31
+ strbuf_addf(&sb, "switch `%c'", opt->short_name);
32
+ else if (flags & OPT_UNSET)
33
+ strbuf_addf(&sb, "option `no-%s'", opt->long_name);
34
+ else
35
+ strbuf_addf(&sb, "option `%s'", opt->long_name);
36
+
37
+ return sb.buf;
38
+}
39
+
40
static enum parse_opt_result get_arg(struct parse_opt_ctx_t *p,
41
const struct option *opt,
42
int flags, const char **arg)
@@ -1006,18 +1021,3 @@ void NORETURN usage_msg_opt(const char *msg,
1021
fprintf(stderr, "fatal: %s\n\n", msg);
1022
usage_with_options(usagestr, options);
1023
}
1009
-
1010
-const char *optname(const struct option *opt, int flags)
1011
-{
1012
- static struct strbuf sb = STRBUF_INIT;
1013
-
1014
- strbuf_reset(&sb);
1015
- if (flags & OPT_SHORT)
1016
- strbuf_addf(&sb, "switch `%c'", opt->short_name);
1017
- else if (flags & OPT_UNSET)
1018
- strbuf_addf(&sb, "option `no-%s'", opt->long_name);
1019
- else
1020
- strbuf_addf(&sb, "option `%s'", opt->long_name);
1021
-
1022
- return sb.buf;
1023
-}