summaryrefslogtreecommitdiff
path: root/run-command.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-04 21:46:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-04 21:46:30 (GMT)
commitbbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6 (patch)
tree9492660cef03802ccee18d814bfed3d1aad5b1d5 /run-command.h
parent6dd0a37c34e79e38aa611fce10dd5609ccc7c39a (diff)
parent2a73b3dad09ef162eb5917e9e0d01d7c306f6b35 (diff)
downloadgit-bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6.zip
git-bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6.tar.gz
git-bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6.tar.bz2
Merge branch 'sb/submodule-parallel-fetch'
Simplify the two callback functions that are triggered when the child process terminates to avoid misuse of the child-process structure that has already been cleaned up. * sb/submodule-parallel-fetch: run-command: do not pass child process data into callbacks
Diffstat (limited to 'run-command.h')
-rw-r--r--run-command.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/run-command.h b/run-command.h
index 42917e8..3d1e59e 100644
--- a/run-command.h
+++ b/run-command.h
@@ -159,8 +159,7 @@ typedef int (*get_next_task_fn)(struct child_process *cp,
* To send a signal to other child processes for abortion, return
* the negative signal number.
*/
-typedef int (*start_failure_fn)(struct child_process *cp,
- struct strbuf *err,
+typedef int (*start_failure_fn)(struct strbuf *err,
void *pp_cb,
void *pp_task_cb);
@@ -179,7 +178,6 @@ typedef int (*start_failure_fn)(struct child_process *cp,
* the negative signal number.
*/
typedef int (*task_finished_fn)(int result,
- struct child_process *cp,
struct strbuf *err,
void *pp_cb,
void *pp_task_cb);
@@ -193,9 +191,8 @@ typedef int (*task_finished_fn)(int result,
* (both stdout and stderr) is routed to stderr in a manner that output
* from different tasks does not interleave.
*
- * If start_failure_fn or task_finished_fn are NULL, default handlers
- * will be used. The default handlers will print an error message on
- * error without issuing an emergency stop.
+ * start_failure_fn and task_finished_fn can be NULL to omit any
+ * special handling.
*/
int run_processes_parallel(int n,
get_next_task_fn,