From 7ac4c205098f6fe2358607c5ea738773525b9d3d Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 21 Dec 2016 20:59:01 +0100 Subject: [PATCH] CLEANUP: 51d: register the deinitialization function deinit_51degrees() is not called anymore from haproxy.c, removing 2 #ifdefs and one include. The function was made static. The include file still includes 51Degrees.h which is needed by global.h and 51d.c so it was not touched beyond this last function removal. --- include/import/51d.h | 2 -- src/51d.c | 3 ++- src/haproxy.c | 8 -------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/import/51d.h b/include/import/51d.h index 4bab242d7..3d7a3c6ad 100644 --- a/include/import/51d.h +++ b/include/import/51d.h @@ -3,6 +3,4 @@ #include <51Degrees.h> -void deinit_51degrees(void); - #endif diff --git a/src/51d.c b/src/51d.c index 3e3133a14..37ee90cec 100644 --- a/src/51d.c +++ b/src/51d.c @@ -600,7 +600,7 @@ static int init_51degrees(void) return 0; } -void deinit_51degrees(void) +static void deinit_51degrees(void) { struct _51d_property_names *_51d_prop_name, *_51d_prop_nameb; @@ -654,4 +654,5 @@ static void __51d_init(void) 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); } diff --git a/src/haproxy.c b/src/haproxy.c index b222b095f..140c3e0f3 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -117,10 +117,6 @@ #include #endif -#ifdef USE_51DEGREES -#include -#endif - /* list of config files */ static struct list cfg_cfgfiles = LIST_HEAD_INIT(cfg_cfgfiles); int pid; /* current process id */ @@ -1579,10 +1575,6 @@ static void deinit(void) deinit_deviceatlas(); #endif -#ifdef USE_51DEGREES - deinit_51degrees(); -#endif - list_for_each_entry(pdf, &post_deinit_list, list) pdf->fct(); -- 2.47.3