[PATCH v4 03/25] sequencer: avoid unnecessary indirection
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Oct 14, 2016, 13:17 UTC
- Message-ID
- <5d5694fc202ad7e4b4255c3a460c8bb3d9cb3d9f.1476450940.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1476450940.git.johannes.schindelin@gmx.de>
We really do not need the *pointer to a* pointer to the options in the read_populate_opts() function.
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 cb16cbd..c2fbf6f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -813,7 +813,7 @@ 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) { if (!file_exists(git_path_opts_file())) return 0; @@ -823,7 +823,7 @@ static int read_populate_opts(struct replay_opts **opts) * about this case, though, because we wrote that file ourselves, so we * are pretty certain that it is syntactically correct. */ - 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; @@ -1054,7 +1054,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;
-- 2.10.1.513.g00ef6dd