diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:02 -0700 |
| commit | 4a636e7682ad46a4fe8eef71ae7917e0d95585f4 (patch) | |
| tree | f46d6a00184519749898a06227944b210f0262c4 | |
| parent | a6ca9ee9e0e30bc96afbdc7d99acf411fbf409c0 (diff) | |
| parent | c1e860f1dcd29495f98fc60d68f75151196335e6 (diff) | |
| download | git-4a636e7682ad46a4fe8eef71ae7917e0d95585f4.tar.gz | |
Merge branch 'js/run-process-parallel-api-fix'
API fix.
* js/run-process-parallel-api-fix:
run_processes_parallel: change confusing task_cb convention
| -rw-r--r-- | builtin/submodule--helper.c | 2 | ||||
| -rw-r--r-- | run-command.c | 4 |
2 files changed, 3 insertions, 3 deletions
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; |