matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: fix hook defs for -Wstrict-prototypes

Browse source 
Without this, the hook code creates functions with empty parameter lists
like "void hook_something()", which is not a proper C prototype.  It
needs to be "void hook_something(void)".  Add some macro shenanigans to
handle that.

... and make the plumbing functions "inline" too.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2021-08-31 23:14:10 +02:00
parent f94825578a
commit 14040553bc
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/hook.h
View file

@ -183,6 +183,12 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
#define HOOK_ADDDEF(...) (void *hookarg , ## __VA_ARGS__) #define HOOK_ADDDEF(...) (void *hookarg , ## __VA_ARGS__)
#define HOOK_ADDARG(...) (hookarg , ## __VA_ARGS__) #define HOOK_ADDARG(...) (hookarg , ## __VA_ARGS__)
/* and another helper to convert () into (void) to get a proper prototype */
#define _SKIP_10(x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, ret, ...) ret
#define _MAKE_VOID(...) _SKIP_10(, ##__VA_ARGS__, , , , , , , , , , void)
#define HOOK_VOIDIFY(...) (_MAKE_VOID(__VA_ARGS__) __VA_ARGS__)
/* use in header file - declares the hook and its arguments /* use in header file - declares the hook and its arguments
* usage: DECLARE_HOOK(my_hook, (int arg1, struct foo *arg2), (arg1, arg2)); * usage: DECLARE_HOOK(my_hook, (int arg1, struct foo *arg2), (arg1, arg2));
* as above, "passlist" must use the same order and same names as "arglist" * as above, "passlist" must use the same order and same names as "arglist"
@ -192,13 +198,14 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
*/ */
#define DECLARE_HOOK(hookname, arglist, passlist) \ #define DECLARE_HOOK(hookname, arglist, passlist) \
extern struct hook _hook_##hookname; \ extern struct hook _hook_##hookname; \
__attribute__((unused)) static void *_hook_typecheck_##hookname( \ __attribute__((unused)) static inline void * \
int(*funcptr) arglist) \ _hook_typecheck_##hookname(int(*funcptr) HOOK_VOIDIFY arglist) \
{ \ { \
return (void *)funcptr; \ return (void *)funcptr; \
} \ } \
__attribute__((unused)) static void *_hook_typecheck_arg_##hookname( \ __attribute__((unused)) static inline void \
int(*funcptr) HOOK_ADDDEF arglist) \ *_hook_typecheck_arg_##hookname(int(*funcptr) \
HOOK_ADDDEF arglist) \
{ \ { \
return (void *)funcptr; \ return (void *)funcptr; \
} \ } \
@ -213,14 +220,14 @@ extern void _hook_unregister(struct hook *hook, void *funcptr, void *arg,
struct hook _hook_##hookname = { \ struct hook _hook_##hookname = { \
.name = #hookname, .entries = NULL, .reverse = rev, \ .name = #hookname, .entries = NULL, .reverse = rev, \
}; \ }; \
static int hook_call_##hookname arglist \ static int hook_call_##hookname HOOK_VOIDIFY arglist \
{ \ { \
int hooksum = 0; \ int hooksum = 0; \
struct hookent *he = _hook_##hookname.entries; \ struct hookent *he = _hook_##hookname.entries; \
void *hookarg; \ void *hookarg; \
union { \ union { \
void *voidptr; \ void *voidptr; \
int(*fptr) arglist; \ int(*fptr) HOOK_VOIDIFY arglist; \
int(*farg) HOOK_ADDDEF arglist; \ int(*farg) HOOK_ADDDEF arglist; \
} hookp; \ } hookp; \
for (; he; he = he->next) { \ for (; he; he = he->next) { \