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>

diff --git a/sequencer.c b/sequencer.c
index cb16cbda3521de5121b69ad96a0b02b4c9bfe3e3..c2fbf6f89c2f2e24f4ee0bf5a0e64d90c7fdaa5e 100644 (file)
--- 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;
 }
 
        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;
 {
        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.
         */
         * 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;
                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 (!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;
 
                        read_populate_todo(&todo_list, opts))
                return -1;