[PATCH v4 09/36] gc: use hook library for pre-auto-gc hook
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-08-03 19:39:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Emily Shaffer <redacted> Move the pre-auto-gc hook away from run-command.h to and over to the new hook.h library. To do this introduce a simple run_hooks_oneshot() wrapper, we'll be using it extensively for these simple cases of wanting to run a single hook under a given name, and having it free the memory we allocate for us. Signed-off-by: Emily Shaffer <redacted> Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- builtin/gc.c | 3 ++- hook.c | 21 +++++++++++++++++++++ hook.h | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index f05d2f0a1ac..2f74cf394d3 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c@@ -32,6 +32,7 @@ #include "remote.h" #include "object-store.h" #include "exec-cmd.h" +#include "hook.h" #define FAILED_RUN "failed to run %s"
@@ -394,7 +395,7 @@ static int need_to_gc(void) else return 0; - if (run_hook_le(NULL, "pre-auto-gc", NULL)) + if (run_hooks_oneshot("pre-auto-gc", NULL)) return 0; return 1; }
diff --git a/hook.c b/hook.c
index c8ff3975043..981a9bf46e6 100644
--- a/hook.c
+++ b/hook.c@@ -170,3 +170,24 @@ int run_hooks(const char *hook_name, const char *hook_path, return cb_data.rc; } + +int run_hooks_oneshot(const char *hook_name, struct run_hooks_opt *options) +{ + const char *hook_path; + int ret; + struct run_hooks_opt hook_opt_scratch = RUN_HOOKS_OPT_INIT; + + if (!options) + options = &hook_opt_scratch; + + hook_path = find_hook(hook_name); + if (!hook_path) { + ret = 0; + goto cleanup; + } + + ret = run_hooks(hook_name, hook_path, options); +cleanup: + run_hooks_opt_clear(options); + return ret; +}
diff --git a/hook.h b/hook.h
index 361984c69d4..2201ab9d568 100644
--- a/hook.h
+++ b/hook.h@@ -51,7 +51,20 @@ void run_hooks_opt_clear(struct run_hooks_opt *o); /** * Takes an already resolved hook found via find_hook() and runs * it. Does not call run_hooks_opt_clear() for you. + * + * See run_hooks_oneshot() for the simpler one-shot API. */ int run_hooks(const char *hookname, const char *hook_path, struct run_hooks_opt *options); + +/** + * Calls find_hook() on your "hook_name" and runs the hooks (if any) + * with run_hooks(). + * + * If "options" is provided calls run_hooks_opt_clear() on it for + * you. If "options" is NULL a scratch one will be provided for you + * before calling run_hooks(). + */ +int run_hooks_oneshot(const char *hook_name, struct run_hooks_opt *options); + #endif
--
2.33.0.rc0.595.ge31e012651d