sequencer: avoid unnecessary indirection
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 14, 2016 at 15:17 UTC
5adf9bdc1b6a1626e6dcafb5a63757cf834c8b94
1 file changed
+3
-3
sequencer.c
+3
-3
@@ -813,7 +813,7 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
813
return 0;
814
}
815
816
-static int read_populate_opts(struct replay_opts **opts)
816
+static int read_populate_opts(struct replay_opts *opts)
817
{
818
if (!file_exists(git_path_opts_file()))
819
return 0;
@@ -823,7 +823,7 @@ static int read_populate_opts(struct replay_opts **opts)
823
* about this case, though, because we wrote that file ourselves, so we
824
* are pretty certain that it is syntactically correct.
825
*/
826
- if (git_config_from_file(populate_opts_cb, git_path_opts_file(), *opts) < 0)
826
+ if (git_config_from_file(populate_opts_cb, git_path_opts_file(), opts) < 0)
827
return error(_("Malformed options sheet: %s"),
828
git_path_opts_file());
829
return 0;
@@ -1054,7 +1054,7 @@ static int sequencer_continue(struct replay_opts *opts)
1054
1055
if (!file_exists(git_path_todo_file()))
1056
return continue_single_pick();
1057
- if (read_populate_opts(&opts) ||
1057
+ if (read_populate_opts(opts) ||
1058
read_populate_todo(&todo_list, opts))
1059
return -1;
1060