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>
René Scharfe committed
Nov 17, 2015 at 11:25 UTC
d3d1f8c46f9ff69de1b4d48d4e194b006ae17a90
1 file changed
+1
-12
parse-options.c
+1
-12
@@ -5,10 +5,6 @@
5
#include "color.h"
6
#include "utf8.h"
7
8
-static int parse_options_usage(struct parse_opt_ctx_t *ctx,
9
- const char * const *usagestr,
10
- const struct option *opts, int err);
11
-
8
#define OPT_SHORT 1
9
#define OPT_UNSET 2
10
@@ -516,7 +512,7 @@ unknown:
512
show_usage_error:
513
err = 1;
514
show_usage:
519
- return parse_options_usage(ctx, usagestr, options, err);
515
+ return usage_with_options_internal(ctx, usagestr, options, 0, err);
516
}
517
518
int parse_options_end(struct parse_opt_ctx_t *ctx)
@@ -662,13 +658,6 @@ void NORETURN usage_msg_opt(const char *msg,
658
usage_with_options(usagestr, options);
659
}
660
665
-static int parse_options_usage(struct parse_opt_ctx_t *ctx,
666
- const char * const *usagestr,
667
- const struct option *opts, int err)
668
-{
669
- return usage_with_options_internal(ctx, usagestr, opts, 0, err);
670
-}
671
-
661
#undef opterror
662
int opterror(const struct option *opt, const char *reason, int flags)
663
{