From 0abf858d9cc9a6bd7bd5e9b0435777631d05213c Mon Sep 17 00:00:00 2001 From: Phillip Whelan Date: Mon, 30 Oct 2023 17:11:03 -0300 Subject: [PATCH] input: rename flb_input_prepare/flb_input_unprepare to flb_input_init/flb_input_exit. Signed-off-by: Phillip Whelan --- include/fluent-bit/flb_input.h | 4 ++-- src/flb_input.c | 6 +++--- src/flb_input_thread.c | 2 +- src/flb_lib.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/fluent-bit/flb_input.h b/include/fluent-bit/flb_input.h index d983ac80abb..27ae9bf9860 100644 --- a/include/fluent-bit/flb_input.h +++ b/include/fluent-bit/flb_input.h @@ -635,8 +635,8 @@ static inline int flb_input_config_map_set(struct flb_input_instance *ins, return ret; } -void flb_input_prepare(); -void flb_input_unprepare(); +void flb_input_init(); +void flb_input_exit(); int flb_input_register_all(struct flb_config *config); struct flb_input_instance *flb_input_new(struct flb_config *config, diff --git a/src/flb_input.c b/src/flb_input.c index 3c577cb3709..204e164aeec 100644 --- a/src/flb_input.c +++ b/src/flb_input.c @@ -141,12 +141,12 @@ int flb_input_log_check(struct flb_input_instance *ins, int l) } /* Prepare input co-routines for the thread. */ -void flb_input_prepare() +void flb_input_init() { FLB_TLS_INIT(in_collect_params); } -void flb_input_unprepare() +void flb_input_exit() { struct flb_in_collect_params *params; @@ -1330,7 +1330,7 @@ void flb_input_exit_all(struct flb_config *config) flb_input_instance_destroy(ins); } - flb_input_unprepare(); + flb_input_exit(); } /* Check that at least one Input is enabled */ diff --git a/src/flb_input_thread.c b/src/flb_input_thread.c index 72a31d173d6..2d656d41c20 100644 --- a/src/flb_input_thread.c +++ b/src/flb_input_thread.c @@ -459,7 +459,7 @@ static void input_thread(void *data) flb_bucket_queue_destroy(evl_bktq); flb_sched_destroy(sched); input_thread_instance_destroy(thi); - flb_input_unprepare(); + flb_input_exit(); } diff --git a/src/flb_lib.c b/src/flb_lib.c index 401c2e9b286..bf69a39eb3f 100644 --- a/src/flb_lib.c +++ b/src/flb_lib.c @@ -127,7 +127,7 @@ void flb_init_env() flb_upstream_init(); flb_downstream_init(); flb_output_prepare(); - flb_input_prepare(); + flb_input_init(); FLB_TLS_INIT(flb_lib_active_context); FLB_TLS_INIT(flb_lib_active_cf_context);