From d2b93afad7a67840d16d424b3cf5ce5255fca7ad Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Mon, 17 Jul 2017 13:59:07 +0200 Subject: src: Remove __init and __exit macro definitions. Add nft_init and nft_exit functions, which calls _init and _exit functions in main.c file. Remove __init and __exit macro definitions as libnftables library will be created soon. Rename realm_table_init() and realm_table_exit() functions to avoid ambiguity as realm_table_rt_init(), realm_table_meta_init, realm_table_rt_exit() and realm_table_meta_exit() in rt.c and meta.c files. Signed-off-by: Varsha Rao Signed-off-by: Pablo Neira Ayuso --- include/nftables.h | 16 ++++++++++++++++ include/utils.h | 2 -- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/nftables.h b/include/nftables.h index 70bf6b5a..640d3c7e 100644 --- a/include/nftables.h +++ b/include/nftables.h @@ -119,4 +119,20 @@ struct mnl_socket; int nft_run(struct nft_ctx *nft, struct mnl_socket *nf_sock, void *scanner, struct parser_state *state, struct list_head *msgs); +void ct_label_table_init(void); +void mark_table_init(void); +void gmp_init(void); +void realm_table_rt_init(void); +void devgroup_table_init(void); +void realm_table_meta_init(void); +void xt_init(void); +void nft_init(void); + +void ct_label_table_exit(void); +void mark_table_exit(void); +void realm_table_meta_exit(void); +void devgroup_table_exit(void); +void realm_table_rt_exit(void); +void nft_exit(void); + #endif /* NFTABLES_NFTABLES_H */ diff --git a/include/utils.h b/include/utils.h index 3199388a..0605eeed 100644 --- a/include/utils.h +++ b/include/utils.h @@ -32,8 +32,6 @@ #define __gmp_fmtstring(x, y) #endif -#define __init __attribute__((constructor)) -#define __exit __attribute__((destructor)) #define __must_check __attribute__((warn_unused_result)) #define __noreturn __attribute__((__noreturn__)) -- cgit v1.2.3