diff-parseopt: convert --inter-hunk-context

diff --git a/diff.c b/diff.c
index 8d387280a4a63171361ae4f3c1294c7e5997d35e..8b65b03c0dfdd36e57d1ad9ed90724512bd64393 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4573,50 +4573,6 @@ void diff_setup_done(struct diff_options *options)
        FREE_AND_NULL(options->parseopts);
 }
 
-static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
-{
-       char c, *eq;
-       int len;
-
-       if (*arg != '-')
-               return 0;
-       c = *++arg;
-       if (!c)
-               return 0;
-       if (c == arg_short) {
-               c = *++arg;
-               if (!c)
-                       return 1;
-               if (val && isdigit(c)) {
-                       char *end;
-                       int n = strtoul(arg, &end, 10);
-                       if (*end)
-                               return 0;
-                       *val = n;
-                       return 1;
-               }
-               return 0;
-       }
-       if (c != '-')
-               return 0;
-       arg++;
-       eq = strchrnul(arg, '=');
-       len = eq - arg;
-       if (!len || strncmp(arg, arg_long, len))
-               return 0;
-       if (*eq) {
-               int n;
-               char *end;
-               if (!isdigit(*++eq))
-                       return 0;
-               n = strtoul(eq, &end, 10);
-               if (*end)
-                       return 0;
-               *val = n;
-       }
-       return 1;
-}
-
 int parse_long_opt(const char *opt, const char **argv,
                   const char **optarg)
 {
@@ -5010,6 +4966,30 @@ static int diff_opt_ignore_submodules(const struct option *opt,
        return 0;
 }
 
+static int diff_opt_line_prefix(const struct option *opt,
+                               const char *optarg, int unset)
+{
+       struct diff_options *options = opt->value;
+
+       BUG_ON_OPT_NEG(unset);
+       options->line_prefix = optarg;
+       options->line_prefix_length = strlen(options->line_prefix);
+       graph_setup_line_prefix(options);
+       return 0;
+}
+
+static int diff_opt_no_prefix(const struct option *opt,
+                             const char *optarg, int unset)
+{
+       struct diff_options *options = opt->value;
+
+       BUG_ON_OPT_NEG(unset);
+       BUG_ON_OPT_ARG(optarg);
+       options->a_prefix = "";
+       options->b_prefix = "";
+       return 0;
+}
+
 static enum parse_opt_result diff_opt_output(struct parse_opt_ctx_t *ctx,
                                             const struct option *opt,
                                             const char *arg, int unset)
@@ -5255,6 +5235,21 @@ static void prep_parse_options(struct diff_options *options)
                            N_("do not munge pathnames and use NULs as output field terminators in --raw or --numstat"),
                            0),
                OPT__ABBREV(&options->abbrev),
+               OPT_STRING_F(0, "src-prefix", &options->a_prefix, N_("<prefix>"),
+                            N_("show the given source prefix instead of \"a/\""),
+                            PARSE_OPT_NONEG),
+               OPT_STRING_F(0, "dst-prefix", &options->b_prefix, N_("<prefix>"),
+                            N_("show the given source prefix instead of \"b/\""),
+                            PARSE_OPT_NONEG),
+               OPT_CALLBACK_F(0, "line-prefix", options, N_("<prefix>"),
+                              N_("prepend an additional prefix to every line of output"),
+                              PARSE_OPT_NONEG, diff_opt_line_prefix),
+               OPT_CALLBACK_F(0, "no-prefix", options, NULL,
+                              N_("do not show any source or destination prefix"),
+                              PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_no_prefix),
+               OPT_INTEGER_F(0, "inter-hunk-context", &options->interhunkcontext,
+                             N_("show context between diff hunks up to the specified number of lines"),
+                             PARSE_OPT_NONEG),
                OPT_CALLBACK_F(0, "output-indicator-new",
                               &options->output_indicators[OUTPUT_INDICATOR_NEW],
                               N_("<char>"),
@@ -5412,8 +5407,6 @@ int diff_opt_parse(struct diff_options *options,
                   const char **av, int ac, const char *prefix)
 {
        const char *arg = av[0];
-       const char *optarg;
-       int argcount;
 
        if (!prefix)
                prefix = "";
@@ -5449,25 +5442,6 @@ int diff_opt_parse(struct diff_options *options,
        }
 
        /* misc options */
-       else if ((argcount = parse_long_opt("src-prefix", av, &optarg))) {
-               options->a_prefix = optarg;
-               return argcount;
-       }
-       else if ((argcount = parse_long_opt("line-prefix", av, &optarg))) {
-               options->line_prefix = optarg;
-               options->line_prefix_length = strlen(options->line_prefix);
-               graph_setup_line_prefix(options);
-               return argcount;
-       }
-       else if ((argcount = parse_long_opt("dst-prefix", av, &optarg))) {
-               options->b_prefix = optarg;
-               return argcount;
-       }
-       else if (!strcmp(arg, "--no-prefix"))
-               options->a_prefix = options->b_prefix = "";
-       else if (opt_arg(arg, '\0', "inter-hunk-context",
-                        &options->interhunkcontext))
-               ;
        else
                return 0;
        return 1;