parse-options: export opterr, optbug

opterror and optbug functions are used by some of parsing routines
in parse-options.c to report errors and bugs respectively.

Export these functions to allow more custom parsing routines to use
them in a uniform way.

Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/parse-options.c b/parse-options.c
index 879ea82a3158ca5e6d4ca397e0c2dd2265e15edc..7b061afcdc1113601a36b14ce3f98044d47073ca 100644 (file)
--- a/parse-options.c
+++ b/parse-options.c
@@ -12,14 +12,14 @@ static int parse_options_usage(struct parse_opt_ctx_t *ctx,
 #define OPT_SHORT 1
 #define OPT_UNSET 2
 
 #define OPT_SHORT 1
 #define OPT_UNSET 2
 

-static int optbug(const struct option *opt, const char *reason)
+int optbug(const struct option *opt, const char *reason)

 {
        if (opt->long_name)
                return error("BUG: option '%s' %s", opt->long_name, reason);
        return error("BUG: switch '%c' %s", opt->short_name, reason);
 }
 
 {
        if (opt->long_name)
                return error("BUG: option '%s' %s", opt->long_name, reason);
        return error("BUG: switch '%c' %s", opt->short_name, reason);
 }
 

-static int opterror(const struct option *opt, const char *reason, int flags)
+int opterror(const struct option *opt, const char *reason, int flags)

 {
        if (flags & OPT_SHORT)
                return error("switch `%c' %s", opt->short_name, reason);
 {
        if (flags & OPT_SHORT)
                return error("switch `%c' %s", opt->short_name, reason);

diff --git a/parse-options.h b/parse-options.h
index 05eb09b878fd94cfcc549622a35a0b897fa56cb9..59e0b524bdcbe1c061f49b8e5f3c6365a9f2eba4 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -165,6 +165,8 @@ extern NORETURN void usage_msg_opt(const char *msg,
                                   const char * const *usagestr,
                                   const struct option *options);
 
                                   const char * const *usagestr,
                                   const struct option *options);
 

+extern int optbug(const struct option *opt, const char *reason);
+extern int opterror(const struct option *opt, const char *reason, int flags);

 /*----- incremental advanced APIs -----*/
 
 enum {
 /*----- incremental advanced APIs -----*/
 
 enum {