From c5630c4868c74aab2fc4e8a4ef4bfc9c51534e0e Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Thu, 1 Dec 2022 23:49:11 +0100 Subject: diff: factor out add_diff_options() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a function for appending the parseopts member of struct diff_options to a struct option array. Use it in two sites instead of accessing the parseopts member directly. Decoupling callers from diff internals like that allows us to change the latter. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- diff.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 648f6717a5..a74bfb4a60 100644 --- a/diff.c +++ b/diff.c @@ -5397,6 +5397,12 @@ static int diff_opt_rotate_to(const struct option *opt, const char *arg, int uns return 0; } +struct option *add_diff_options(const struct option *opts, + struct diff_options *options) +{ + return parse_options_concat(opts, options->parseopts); +} + static void prep_parse_options(struct diff_options *options) { struct option parseopts[] = { -- cgit v1.3