RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-02 11:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: init: Fix the prototype for per-thread free callbacks

Browse Source 
Functions registered to release memory per-thread have no return value. But the
registering function and the function pointer in per_thread_free_fct structure
specify it should return an integer. This patch fixes it.

This patch may be backported as far as 2.0.
This commit is contained in:
Christopher Faulet 2020-11-06 15:19:19 +01:00
parent c751b4508d
commit 83fefbcdff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/global.h
View File

@ -76,7 +76,7 @@ void hap_register_server_deinit(void (*fct)(struct server *));
void hap_register_per_thread_alloc(int (*fct)()); void hap_register_per_thread_alloc(int (*fct)());
void hap_register_per_thread_init(int (*fct)()); void hap_register_per_thread_init(int (*fct)());
void hap_register_per_thread_deinit(void (*fct)()); void hap_register_per_thread_deinit(void (*fct)());
void hap_register_per_thread_free(int (*fct)()); void hap_register_per_thread_free(void (*fct)());
void mworker_accept_wrapper(int fd); void mworker_accept_wrapper(int fd);
void mworker_reload(); void mworker_reload();

4
src/haproxy.c
View File

@ -349,7 +349,7 @@ struct server_deinit_fct {
struct list per_thread_free_list = LIST_HEAD_INIT(per_thread_free_list); struct list per_thread_free_list = LIST_HEAD_INIT(per_thread_free_list);
struct per_thread_free_fct { struct per_thread_free_fct {
struct list list; struct list list;
int (*fct)(); void (*fct)();
}; };
/* These functions are called for each thread just after the scheduler loop and /* These functions are called for each thread just after the scheduler loop and
@ -521,7 +521,7 @@ void hap_register_per_thread_deinit(void (*fct)())
} }
/* used to register some free functions to call for each thread. */ /* used to register some free functions to call for each thread. */
void hap_register_per_thread_free(int (*fct)()) void hap_register_per_thread_free(void (*fct)())
{ {
struct per_thread_free_fct *b; struct per_thread_free_fct *b;