mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: 51d: register the deinitialization function

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2016-12-21 20:59:01 +01:00
parent 800f93f375
commit 7ac4c20509
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/import/51d.h
View File

@ -3,6 +3,4 @@
#include <51Degrees.h>
void deinit_51degrees(void);
#endif

3
src/51d.c
View File

@ -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);
}

8
src/haproxy.c
View File

@ -117,10 +117,6 @@
#include <import/da.h>
#endif
#ifdef USE_51DEGREES
#include <import/51d.h>
#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();