We want to reuse the error reporting facilities in a later patch. Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx> Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- run-command.c | 18 +++++++++--------- run-command.h | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/run-command.c b/run-command.c index 2f8f222..c9b13cf 100644 --- a/run-command.c +++ b/run-command.c @@ -902,10 +902,10 @@ struct parallel_processes { struct strbuf buffered_output; /* of finished children */ }; -static int default_start_failure(struct child_process *cp, - struct strbuf *err, - void *pp_cb, - void *pp_task_cb) +int default_start_failure(struct child_process *cp, + struct strbuf *err, + void *pp_cb, + void *pp_task_cb) { int i; @@ -916,11 +916,11 @@ static int default_start_failure(struct child_process *cp, return 0; } -static int default_task_finished(int result, - struct child_process *cp, - struct strbuf *err, - void *pp_cb, - void *pp_task_cb) +int default_task_finished(int result, + struct child_process *cp, + struct strbuf *err, + void *pp_cb, + void *pp_task_cb) { int i; diff --git a/run-command.h b/run-command.h index d5a57f9..a054fa6 100644 --- a/run-command.h +++ b/run-command.h @@ -164,6 +164,15 @@ typedef int (*start_failure_fn)(struct child_process *cp, void *pp_task_cb); /** + * If a command fails to start, then print an error message stating the + * exact command which failed. + */ +int default_start_failure(struct child_process *cp, + struct strbuf *err, + void *pp_cb, + void *pp_task_cb); + +/** * This callback is called on every child process that finished processing. * * You must not write to stdout or stderr in this function. Add your @@ -184,6 +193,16 @@ typedef int (*task_finished_fn)(int result, void *pp_task_cb); /** + * If the child process returns with a non zero error code, print + * an error message of the exact command which failed. + */ +int default_task_finished(int result, + struct child_process *cp, + struct strbuf *err, + void *pp_cb, + void *pp_task_cb); + +/** * Runs up to n processes at the same time. Whenever a process can be * started, the callback get_next_task_fn is called to obtain the data * required to start another child process. -- 2.7.0.rc0.36.g75877e4.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html