From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Aug 2017 20:27:02 +0000 (-0700)
Subject: Merge branch 'js/run-process-parallel-api-fix'
X-Git-Tag: v2.15.0-rc0~195
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a636e7682ad46a4fe8eef71ae7917e0d95585f4?hp=a6ca9ee9e0e30bc96afbdc7d99acf411fbf409c0

Merge branch 'js/run-process-parallel-api-fix'

API fix.

* js/run-process-parallel-api-fix:
run_processes_parallel: change confusing task_cb convention
---

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index af871f14e7..84562ec833 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -930,7 +930,7 @@ static int update_clone_task_finished(int result,
 	const struct cache_entry *ce;
 	struct submodule_update_clone *suc = suc_cb;
 
-	int *idxP = *(int**)idx_task_cb;
+	int *idxP = idx_task_cb;
 	int idx = *idxP;
 	free(idxP);
 
diff --git a/run-command.c b/run-command.c
index 9e36151bf9..b5e6eb37c0 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp)
 	if (start_command(&pp->children[i].process)) {
 		code = pp->start_failure(&pp->children[i].err,
 					 pp->data,
-					 &pp->children[i].data);
+					 pp->children[i].data);
 		strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
 		strbuf_reset(&pp->children[i].err);
 		if (code)
@@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
 
 		code = pp->task_finished(code,
 					 &pp->children[i].err, pp->data,
-					 &pp->children[i].data);
+					 pp->children[i].data);
 
 		if (code)
 			result = code;