summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-04 16:43:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-06 13:25:01 -0700
commite3a0ca878457ecc70d0065802fcb0c6875c6b671 (patch)
tree4737068ddabb9b0b01dffa09985dc8045fb39570 /parse-options.c
parent6096d7598058d920485d206477f4383ba1a862cb (diff)
downloadgit-e3a0ca878457ecc70d0065802fcb0c6875c6b671.tar.gz
parse-options: make OPT_INTEGER's argh explicit
OPTION_INTEGER hardcodes its argh member to be "n", but the decision is hidden deep in usage_with_options_internal(). Make "n" the default argh for the OPT_INTEGER macro while leaving it undecided for the OPTION_INTEGER enum. This makes it less surprising to users that argh is "n" when using the OPT_INTEGER macro. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Reviewed-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/parse-options.c b/parse-options.c
index b85cab2466..48ba62b0d8 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -503,19 +503,12 @@ int usage_with_options_internal(const char * const *usagestr,
switch (opts->type) {
case OPTION_ARGUMENT:
break;
- case OPTION_INTEGER:
- if (opts->flags & PARSE_OPT_OPTARG)
- if (opts->long_name)
- pos += fprintf(stderr, "[=<n>]");
- else
- pos += fprintf(stderr, "[<n>]");
- else
- pos += fprintf(stderr, " <n>");
- break;
case OPTION_CALLBACK:
if (opts->flags & PARSE_OPT_NOARG)
break;
/* FALLTHROUGH */
+ case OPTION_INTEGER:
+ /* FALLTHROUGH */
case OPTION_FILENAME:
/* FALLTHROUGH */
case OPTION_STRING: