bisect--helper: change `retval` to `res`

Let's rename variable retval to res, so that variable names
in bisect--helper.c are more consistent.

After this change, there are 110 occurrences of res in the file
and zero of retval, while there were 26 instances of retval before.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com>
Signed-off-by: Miriam Rubio <mirucam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 36c09b72380f2291aecf4d0ede20290cd1dbb58d..21de5c096cf4b47a75341fba13adfbfc21a260ab 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -206,31 +206,31 @@ static int bisect_write(const char *state, const char *rev,
        struct object_id oid;
        struct commit *commit;
        FILE *fp = NULL;
-       int retval = 0;
+       int res = 0;
 
        if (!strcmp(state, terms->term_bad)) {
                strbuf_addf(&tag, "refs/bisect/%s", state);
        } else if (one_of(state, terms->term_good, "skip", NULL)) {
                strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev);
        } else {
-               retval = error(_("Bad bisect_write argument: %s"), state);
+               res = error(_("Bad bisect_write argument: %s"), state);
                goto finish;
        }
 
        if (get_oid(rev, &oid)) {
-               retval = error(_("couldn't get the oid of the rev '%s'"), rev);
+               res = error(_("couldn't get the oid of the rev '%s'"), rev);
                goto finish;
        }
 
        if (update_ref(NULL, tag.buf, &oid, NULL, 0,
                       UPDATE_REFS_MSG_ON_ERR)) {
-               retval = -1;
+               res = -1;
                goto finish;
        }
 
        fp = fopen(git_path_bisect_log(), "a");
        if (!fp) {
-               retval = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
+               res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
                goto finish;
        }
 
@@ -244,7 +244,7 @@ finish:
        if (fp)
                fclose(fp);
        strbuf_release(&tag);
-       return retval;
+       return res;
 }
 
 static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
@@ -294,7 +294,7 @@ static const char need_bisect_start_warning[] =
 static int bisect_next_check(const struct bisect_terms *terms,
                             const char *current_term)
 {
-       int missing_good = 1, missing_bad = 1, retval = 0;
+       int missing_good = 1, missing_bad = 1, res = 0;
        const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
        const char *good_glob = xstrfmt("%s-*", terms->term_good);
 
@@ -308,7 +308,7 @@ static int bisect_next_check(const struct bisect_terms *terms,
                goto finish;
 
        if (!current_term) {
-               retval = -1;
+               res = -1;
                goto finish;
        }
 
@@ -329,21 +329,21 @@ static int bisect_next_check(const struct bisect_terms *terms,
                 */
                yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO);
                if (starts_with(yesno, "N") || starts_with(yesno, "n"))
-                       retval = -1;
+                       res = -1;
                goto finish;
        }
        if (!is_empty_or_missing_file(git_path_bisect_start())) {
-               retval = error(_(need_bad_and_good_revision_warning),
+               res = error(_(need_bad_and_good_revision_warning),
                               vocab_bad, vocab_good, vocab_bad, vocab_good);
        } else {
-               retval = error(_(need_bisect_start_warning),
+               res = error(_(need_bisect_start_warning),
                               vocab_good, vocab_bad, vocab_good, vocab_bad);
        }
 
 finish:
        free((void *) good_glob);
        free((void *) bad_ref);
-       return retval;
+       return res;
 }
 
 static int get_terms(struct bisect_terms *terms)
@@ -397,7 +397,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option)
 
 static int bisect_append_log_quoted(const char **argv)
 {
-       int retval = 0;
+       int res = 0;
        FILE *fp = fopen(git_path_bisect_log(), "a");
        struct strbuf orig_args = STRBUF_INIT;
 
@@ -405,25 +405,25 @@ static int bisect_append_log_quoted(const char **argv)
                return -1;
 
        if (fprintf(fp, "git bisect start") < 1) {
-               retval = -1;
+               res = -1;
                goto finish;
        }
 
        sq_quote_argv(&orig_args, argv);
        if (fprintf(fp, "%s\n", orig_args.buf) < 1)
-               retval = -1;
+               res = -1;
 
 finish:
        fclose(fp);
        strbuf_release(&orig_args);
-       return retval;
+       return res;
 }
 
 static int bisect_start(struct bisect_terms *terms, int no_checkout,
                        const char **argv, int argc)
 {
        int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0;
-       int flags, pathspec_pos, retval = 0;
+       int flags, pathspec_pos, res = 0;
        struct string_list revs = STRING_LIST_INIT_DUP;
        struct string_list states = STRING_LIST_INIT_DUP;
        struct strbuf start_head = STRBUF_INIT;
@@ -524,7 +524,7 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
                        argv_array_pushl(&argv, "checkout", start_head.buf,
                                         "--", NULL);
                        if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
-                               retval = error(_("checking out '%s' failed."
+                               res = error(_("checking out '%s' failed."
                                                 " Try 'git bisect start "
                                                 "<valid-branch>'."),
                                               start_head.buf);
@@ -572,12 +572,12 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 
        if (no_checkout) {
                if (get_oid(start_head.buf, &oid) < 0) {
-                       retval = error(_("invalid ref: '%s'"), start_head.buf);
+                       res = error(_("invalid ref: '%s'"), start_head.buf);
                        goto finish;
                }
                if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
                               UPDATE_REFS_MSG_ON_ERR)) {
-                       retval = -1;
+                       res = -1;
                        goto finish;
                }
        }
@@ -589,26 +589,26 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
        for (i = 0; i < states.nr; i++)
                if (bisect_write(states.items[i].string,
                                 revs.items[i].string, terms, 1)) {
-                       retval = -1;
+                       res = -1;
                        goto finish;
                }
 
        if (must_write_terms && write_terms(terms->term_bad,
                                            terms->term_good)) {
-               retval = -1;
+               res = -1;
                goto finish;
        }
 
-       retval = bisect_append_log_quoted(argv);
-       if (retval)
-               retval = -1;
+       res = bisect_append_log_quoted(argv);
+       if (res)
+               res = -1;
 
 finish:
        string_list_clear(&revs, 0);
        string_list_clear(&states, 0);
        strbuf_release(&start_head);
        strbuf_release(&bisect_names);
-       return retval;
+       return res;
 }
 
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)