Change a couple of users of "report_fn" that hardcoded a definition of it to use the definition of report_fn instead. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- I'll eventually want to depend on this for a larger topic I plan to re-roll[1], but in the meantime this trivial fix can hopefully cook & graduate. 1. https://lore.kernel.org/git/RFC-cover-00.21-00000000000-20211115T220831Z-avarab@xxxxxxxxx/ apply.h | 4 ++-- run-command.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apply.h b/apply.h index 4052da50c06..3ddc8be9c71 100644 --- a/apply.h +++ b/apply.h @@ -103,8 +103,8 @@ struct apply_state { * set_error_routine() or set_warn_routine() to install muting * routines when in verbosity_silent mode. */ - void (*saved_error_routine)(const char *err, va_list params); - void (*saved_warn_routine)(const char *warn, va_list params); + report_fn saved_error_routine; + report_fn saved_warn_routine; /* These control whitespace errors */ enum apply_ws_error_action ws_error_action; diff --git a/run-command.c b/run-command.c index a8501e38ceb..3d854c498aa 100644 --- a/run-command.c +++ b/run-command.c @@ -362,10 +362,9 @@ static void NORETURN child_die_fn(const char *err, va_list params) /* this runs in the parent process */ static void child_err_spew(struct child_process *cmd, struct child_err *cerr) { - static void (*old_errfn)(const char *err, va_list params); + report_fn old_errfn = get_error_routine(); report_fn die_message_routine = get_die_message_routine(); - old_errfn = get_error_routine(); set_error_routine(die_message_routine); errno = cerr->syserr; -- 2.35.1.1132.ga1fe46f8690
