From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: bmwill@google.com, jrnieder@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 5/7] submodule--helper: factor out allocation of callback cookie
Date: Wed, 15 Aug 2018 19:30:58 -0700 [thread overview]
Message-ID: <20180816023100.161626-6-sbeller@google.com> (raw)
In-Reply-To: <20180816023100.161626-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@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
next prev parent reply other threads:[~2018-08-16 2:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 2:30 [RFC PATCH 0/7] Unset the submodule URL in the superproject when no longer needed Stefan Beller
2018-08-16 2:30 ` [PATCH 1/7] t7410: update to new style Stefan Beller
2018-08-16 17:06 ` Junio C Hamano
2018-08-16 2:30 ` [PATCH 2/7] builtin/submodule--helper: remove stray new line Stefan Beller
2018-08-16 2:30 ` [PATCH 3/7] submodule: is_submodule_active to differentiate between new and old mode Stefan Beller
2018-08-16 17:37 ` Junio C Hamano
2018-08-20 19:50 ` Stefan Beller
2018-08-21 21:39 ` Junio C Hamano
2018-08-16 2:30 ` [PATCH 4/7] submodule sync: omit setting submodule URL in config if possible Stefan Beller
2018-08-16 2:30 ` Stefan Beller [this message]
2018-08-16 2:30 ` [PATCH 6/7] submodule--helper, update_clone: store index to update_clone instead of ce Stefan Beller
2018-08-16 2:31 ` [PATCH 7/7] builtin/submodule--helper: unset submodule url if possible Stefan Beller
2018-08-16 15:12 ` [RFC PATCH 0/7] Unset the submodule URL in the superproject when no longer needed Junio C Hamano
2018-08-16 15:45 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180816023100.161626-6-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).