summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2015-11-17 11:25:27 +0100
committerJeff King <peff@peff.net>2015-11-20 08:02:07 -0500
commitd3d1f8c46f9ff69de1b4d48d4e194b006ae17a90 (patch)
tree6b4a5f27ec9726058c14ef6d3e063d33e79c0f5a
parentac20ff6daa818b3dad99368dfbc123dcf81e6824 (diff)
downloadgit-d3d1f8c46f9ff69de1b4d48d4e194b006ae17a90.tar.gz
parse-options: inline parse_options_usage() at its only remaining caller
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net>
-rw-r--r--parse-options.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/parse-options.c b/parse-options.c
index f0b6d9b0c7..4863966fa5 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -5,10 +5,6 @@
#include "color.h"
#include "utf8.h"
-static int parse_options_usage(struct parse_opt_ctx_t *ctx,
- const char * const *usagestr,
- const struct option *opts, int err);
-
#define OPT_SHORT 1
#define OPT_UNSET 2
@@ -516,7 +512,7 @@ unknown:
show_usage_error:
err = 1;
show_usage:
- return parse_options_usage(ctx, usagestr, options, err);
+ return usage_with_options_internal(ctx, usagestr, options, 0, err);
}
int parse_options_end(struct parse_opt_ctx_t *ctx)
@@ -662,13 +658,6 @@ void NORETURN usage_msg_opt(const char *msg,
usage_with_options(usagestr, options);
}
-static int parse_options_usage(struct parse_opt_ctx_t *ctx,
- const char * const *usagestr,
- const struct option *opts, int err)
-{
- return usage_with_options_internal(ctx, usagestr, opts, 0, err);
-}
-
#undef opterror
int opterror(const struct option *opt, const char *reason, int flags)
{