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>

diff --git a/parse-options.c b/parse-options.c
index f0b6d9b0c7e8cca325afce9fb6e122a112ec93b9..4863966fa597bd8d3e86fa76296ab0541efa7115 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -5,10 +5,6 @@
 #include "color.h"
 #include "utf8.h"
 
 #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
 
 #define OPT_SHORT 1
 #define OPT_UNSET 2
 


@@ -516,7 +512,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
  show_usage_error:
        err = 1;
  show_usage:
  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)
 }
 
 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);
 }
 
        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)
 {
 #undef opterror
 int opterror(const struct option *opt, const char *reason, int flags)
 {