Merge branch 'js/parseopt-unknown-cb-returns-an-enum'

Code clean-up.

* js/parseopt-unknown-cb-returns-an-enum:
parse-options: adjust `parse_opt_unknown_cb()`s declared return type

diff --combined parse-options.h
index 98ea42ffd9ecd977b655143651359bf1859eba2a,cd756833a9947f101fc3356ebdbb22aef3f98c16..ac6ba8abf9ec7af1712486ecfe3e397359c4a67f
--- 1/parse-options.h
--- 2/parse-options.h
+++ b/parse-options.h
@@@ -7,7 -7,6 +7,7 @@@ enum parse_opt_type 
        OPTION_ARGUMENT,
        OPTION_GROUP,
        OPTION_NUMBER,
 +      OPTION_ALIAS,
        /* options with no arguments */
        OPTION_BIT,
        OPTION_NEGBIT,
@@@ -184,9 -183,6 +184,9 @@@ struct option 
          N_("no-op (backward compatibility)"),         \
          PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, parse_opt_noop_cb }
  
 +#define OPT_ALIAS(s, l, source_long_name) \
 +      { OPTION_ALIAS, (s), (l), (source_long_name) }
 +
  /*
   * parse_options() will filter out the processed options and leave the
   * non-option arguments in argv[]. argv0 is assumed program name and
@@@ -262,8 -258,6 +262,8 @@@ struct parse_opt_ctx_t 
        const char *opt;
        int flags;
        const char *prefix;
 +      const char **alias_groups; /* must be in groups of 3 elements! */
 +      struct option *updated_options;
  };
  
  void parse_options_start(struct parse_opt_ctx_t *ctx,
@@@ -292,7 -286,9 +292,9 @@@ int parse_opt_commit(const struct optio
  int parse_opt_tertiary(const struct option *, const char *, int);
  int parse_opt_string_list(const struct option *, const char *, int);
  int parse_opt_noop_cb(const struct option *, const char *, int);
- int parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, const struct option *, const char *, int);
+ enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
+                                          const struct option *,
+                                          const char *, int);
  int parse_opt_passthru(const struct option *, const char *, int);
  int parse_opt_passthru_argv(const struct option *, const char *, int);