MEDIUM: init: convert all trivial registration calls to initcalls
This switches explicit calls to various trivial registration methods for
keywords, muxes or protocols from constructors to INITCALL1 at stage
STG_REGISTER. All these calls have in common to consume a single pointer
and return void. Doing this removes 26 constructors. The following calls
were addressed :
- acl_register_keywords
- bind_register_keywords
- cfg_register_keywords
- cli_register_kw
- flt_register_keywords
- http_req_keywords_register
- http_res_keywords_register
- protocol_register
- register_mux_proto
- sample_register_convs
- sample_register_fetches
- srv_register_keywords
- tcp_req_conn_keywords_register
- tcp_req_cont_keywords_register
- tcp_req_sess_keywords_register
- tcp_res_cont_keywords_register
- flt_register_keywords
diff --git a/src/51d.c b/src/51d.c
index e092c5b..d537964 100644
--- a/src/51d.c
+++ b/src/51d.c
@@ -4,6 +4,7 @@
#include <common/chunk.h>
#include <common/buffer.h>
#include <common/errors.h>
+#include <common/initcall.h>
#include <proto/arg.h>
#include <proto/http_fetch.h>
#include <proto/log.h>
@@ -667,25 +668,28 @@
{ 0, NULL, NULL },
}};
+INITCALL1(STG_REGISTER, cfg_register_keywords, &_51dcfg_kws);
+
/* Note: must not be declared <const> as its list will be overwritten */
static struct sample_fetch_kw_list sample_fetch_keywords = {ILH, {
{ "51d.all", _51d_fetch, ARG5(1,STR,STR,STR,STR,STR), _51d_fetch_check, SMP_T_STR, SMP_USE_HRQHV },
{ NULL, NULL, 0, 0, 0 },
}};
+INITCALL1(STG_REGISTER, sample_register_fetches, &sample_fetch_keywords);
+
/* Note: must not be declared <const> as its list will be overwritten */
static struct sample_conv_kw_list conv_kws = {ILH, {
{ "51d.single", _51d_conv, ARG5(1,STR,STR,STR,STR,STR), _51d_conv_check, SMP_T_STR, SMP_T_STR },
{ NULL, NULL, 0, 0, 0 },
}};
+INITCALL1(STG_REGISTER, sample_register_convs, &conv_kws);
+
__attribute__((constructor))
static void __51d_init(void)
{
/* register sample fetch and conversion keywords */
- sample_register_fetches(&sample_fetch_keywords);
- sample_register_convs(&conv_kws);
- cfg_register_keywords(&_51dcfg_kws);
hap_register_build_opts("Built with 51Degrees support.", 0);
hap_register_post_check(init_51degrees);
hap_register_post_deinit(deinit_51degrees);