Re: [PATCH 03/22] sequencer: avoid unnecessary indirection
- From
Jakub Narębski <jnareb@gmail.com>
- Date
- Aug 29, 2016, 20:22 UTC
- Message-ID
- <90d26cba-0013-eb31-ba40-52f3e2f9d239@gmail.com>
- In-Reply-To
- <e5e6c27038c7db226a787da6b7ee343b2b310654.1472457609.git.johannes.schindelin@gmx.de>
W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
> We really do not need the *pointer to a* pointer to the options in > the read_populate_opts() function.
Right.
Show 15 quoted lines
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > sequencer.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sequencer.c b/sequencer.c > index 4d2b4e3..14ef79b 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -809,11 +809,11 @@ static int populate_opts_cb(const char *key, const char *value, void *data) > return 0; > } > > -static int read_populate_opts(struct replay_opts **opts) > +static int read_populate_opts(struct replay_opts *opts)
Especially that other *_populate_*() use 'struct replay_opts *opts':
read_populate_todo(struct commit_list **todo_list, struct replay_opts *opts) walk_revs_populate_todo(struct commit_list **todo_list, struct replay_opts *opts)
Though they use **todo_list, because they modify this list; maybe that was why read_populate_opts was using **opts instead of *opts?
Show 18 quoted lines
> {
> if (!file_exists(git_path_opts_file()))
> return 0;
> - if (git_config_from_file(populate_opts_cb, git_path_opts_file(), *opts) < 0)
> + if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
> return error(_("Malformed options sheet: %s"),
> git_path_opts_file());
> return 0;
> @@ -1038,7 +1038,7 @@ static int sequencer_continue(struct replay_opts *opts)
>
> if (!file_exists(git_path_todo_file()))
> return continue_single_pick();
> - if (read_populate_opts(&opts) ||
> + if (read_populate_opts(opts) ||
> read_populate_todo(&todo_list, opts))
> return -1;
>
>