submodule--helper: rename "int res" to "int ret"

Rename the "res" variable added in b3c5f5cb048 (submodule: move core
cmd_update() logic to C, 2022-03-15) to "ret", which is the convention
in the rest of this file.

Eventual follow-up commits will change the code in update_submodule()
to a "goto cleanup" pattern, let's have the post image look consistent
with the rest. For update_submodules() let's also use a "ret" for
consistency, that use was also added in b3c5f5cb048. We'll be
modifying that codepath in subsequent commits.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 557834fa739f35735110218288f604508c79ba02..d76ee0323e80ab91debca7ed4ccff7d93ab3e6f4 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2426,7 +2426,7 @@ static int update_submodule(struct update_data *update_data)
        if (update_data->recursive) {
                struct child_process cp = CHILD_PROCESS_INIT;
                struct update_data next = *update_data;
-               int res;
+               int ret;
 
                next.prefix = NULL;
                oidcpy(&next.oid, null_oid());
@@ -2438,13 +2438,13 @@ static int update_submodule(struct update_data *update_data)
                update_data_to_args(&next, &cp.args);
 
                /* die() if child process die()'d */
-               res = run_command(&cp);
-               if (!res)
+               ret = run_command(&cp);
+               if (!ret)
                        return 0;
                die_message(_("Failed to recurse into submodule path '%s'"),
                            update_data->displaypath);
-               if (res == 128)
-                       exit(res);
+               if (ret == 128)
+                       exit(ret);
                return 1;
        }
 
@@ -2453,7 +2453,7 @@ static int update_submodule(struct update_data *update_data)
 
 static int update_submodules(struct update_data *update_data)
 {
-       int i, res = 0;
+       int i, ret = 0;
        struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
 
        suc.update_data = update_data;
@@ -2471,7 +2471,7 @@ static int update_submodules(struct update_data *update_data)
         * - the listener can avoid doing any work if fetching failed.
         */
        if (suc.quickstop) {
-               res = 1;
+               ret = 1;
                goto cleanup;
        }
 
@@ -2483,12 +2483,12 @@ static int update_submodules(struct update_data *update_data)
                update_data->sm_path = ucd.sub->path;
 
                if (update_submodule(update_data))
-                       res = 1;
+                       ret = 1;
        }
 
 cleanup:
        string_list_clear(&update_data->references, 0);
-       return res;
+       return ret;
 }
 
 static int module_update(int argc, const char **argv, const char *prefix)