Skip to content

Commit 4a636e7

Browse files
committed
Merge branch 'js/run-process-parallel-api-fix'
API fix. * js/run-process-parallel-api-fix: run_processes_parallel: change confusing task_cb convention
2 parents a6ca9ee + c1e860f commit 4a636e7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ static int update_clone_task_finished(int result,
930930
const struct cache_entry *ce;
931931
struct submodule_update_clone *suc = suc_cb;
932932

933-
int *idxP = *(int**)idx_task_cb;
933+
int *idxP = idx_task_cb;
934934
int idx = *idxP;
935935
free(idxP);
936936

run-command.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp)
15331533
if (start_command(&pp->children[i].process)) {
15341534
code = pp->start_failure(&pp->children[i].err,
15351535
pp->data,
1536-
&pp->children[i].data);
1536+
pp->children[i].data);
15371537
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
15381538
strbuf_reset(&pp->children[i].err);
15391539
if (code)
@@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
16011601

16021602
code = pp->task_finished(code,
16031603
&pp->children[i].err, pp->data,
1604-
&pp->children[i].data);
1604+
pp->children[i].data);
16051605

16061606
if (code)
16071607
result = code;

0 commit comments

Comments
 (0)