[PATCH 5/7] submodule--helper: factor out allocation of callback cookie

[Stefan Beller]

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 builtin/submodule--helper.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 639d0bb20a1..1c9a12781fd 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1688,6 +1688,13 @@ static int prepare_to_clone_next_submodule(const struct 
cache_entry *ce,
        return needs_cloning;
 }
 
+static void *update_clone_alloc_cb(int i)
+{
+       int *p = xmalloc(sizeof(*p));
+       *p = i;
+       return p;
+}
+
 static int update_clone_get_next_task(struct child_process *child,
                                      struct strbuf *err,
                                      void *suc_cb,
@@ -1700,9 +1707,7 @@ static int update_clone_get_next_task(struct 
child_process *child,
        for (; suc->current < suc->list.nr; suc->current++) {
                ce = suc->list.entries[suc->current];
                if (prepare_to_clone_next_submodule(ce, child, suc, err)) {
-                       int *p = xmalloc(sizeof(*p));
-                       *p = suc->current;
-                       *idx_task_cb = p;
+                       *idx_task_cb = update_clone_alloc_cb(suc->current);
                        suc->current++;
                        return 1;
                }
@@ -1715,7 +1720,6 @@ static int update_clone_get_next_task(struct 
child_process *child,
         */
        index = suc->current - suc->list.nr;
        if (index < suc->failed_clones_nr) {
-               int *p;
                ce = suc->failed_clones[index];
                if (!prepare_to_clone_next_submodule(ce, child, suc, err)) {
                        suc->current ++;
@@ -1724,9 +1728,7 @@ static int update_clone_get_next_task(struct 
child_process *child,
                                           "any more?\n");
                        return 0;
                }
-               p = xmalloc(sizeof(*p));
-               *p = suc->current;
-               *idx_task_cb = p;
+               *idx_task_cb = update_clone_alloc_cb(suc->current);
                suc->current ++;
                return 1;
        }
-- 
2.18.0.265.g16de1b435c9.dirty