[PATCH v2 3/7] sequencer.[ch]: pass "struct strvec *" instead of int/char ** pair
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 12, 2021, 00:15 UTC
- Message-ID
- <patch-v2-3.7-c35cfb9c9c5-20210912T001420Z-avarab@gmail.com>
- In-Reply-To
- <cover-v2-0.7-00000000000-20210912T001420Z-avarab@gmail.com>
As in the preceding commit, prepare for the "nr" member of "struct strvec" changing from an "int" to a "size_t". These are the same sorts of changes to pass a "struct strvec *" further down instead of passing args->nr and args->v.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/rebase.c | 3 +-- sequencer.c | 6 +++--- sequencer.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c index eb01f4d790b..27669880918 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -363,8 +363,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) oid_to_hex(&opts->restrict_revision->object.oid)); ret = sequencer_make_script(the_repository, &todo_list.buf, - make_script_args.nr, make_script_args.v, - flags); + &make_script_args, flags); if (ret) error(_("could not generate todo list")); diff --git a/sequencer.c b/sequencer.c index 68316636921..a4ba434f173 100644 --- a/sequencer.c +++ b/sequencer.c @@ -5355,8 +5355,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, return 0; } -int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, - const char **argv, unsigned flags) +int sequencer_make_script(struct repository *r, struct strbuf *out, + struct strvec *args, unsigned flags) { char *format = NULL; struct pretty_print_context pp = {0}; @@ -5390,7 +5390,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, pp.fmt = revs.commit_format; pp.output_encoding = get_log_output_encoding(); - if (setup_revisions(argc, argv, &revs, NULL) > 1) + if (setup_revisions(args->nr, args->v, &revs, NULL) > 1) return error(_("make_script: unhandled options")); if (prepare_revision_walk(&revs) < 0) diff --git a/sequencer.h b/sequencer.h index 2088344cb37..36f67164f86 100644 --- a/sequencer.h +++ b/sequencer.h @@ -158,8 +158,8 @@ int sequencer_remove_state(struct replay_opts *opts); #define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7) #define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8) -int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, - const char **argv, unsigned flags); +int sequencer_make_script(struct repository *r, struct strbuf *out, + struct strvec *args, unsigned flags); void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands);
-- 2.33.0.998.ga4d44345d43