diff options
| author | David Lamparter <equinox@diac24.net> | 2021-02-21 07:07:15 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2021-03-17 06:18:39 +0100 |
| commit | 80413c2073a20774b264ab04f7a4ea4515699790 (patch) | |
| tree | 7902d0a3503de17d469f5dd8fafefbe1df5583c6 /lib | |
| parent | *: require semicolon after DEFINE_<typesafe...> (diff) | |
| download | frr-80413c2073a20774b264ab04f7a4ea4515699790.tar.xz frr-80413c2073a20774b264ab04f7a4ea4515699790.zip | |
*: require semicolon after FRR_DAEMON_INFO & co.
... again ...
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/agentx.c | 2 | ||||
| -rw-r--r-- | lib/libfrr.h | 4 | ||||
| -rw-r--r-- | lib/module.c | 2 | ||||
| -rw-r--r-- | lib/module.h | 9 | ||||
| -rw-r--r-- | lib/northbound_confd.c | 3 | ||||
| -rw-r--r-- | lib/northbound_grpc.cpp | 3 | ||||
| -rw-r--r-- | lib/northbound_sysrepo.c | 3 | ||||
| -rw-r--r-- | lib/resolver.c | 2 | ||||
| -rw-r--r-- | lib/xref.h | 2 |
9 files changed, 17 insertions, 13 deletions
diff --git a/lib/agentx.c b/lib/agentx.c index 3f1a8edba..b5a035ee2 100644 --- a/lib/agentx.c +++ b/lib/agentx.c @@ -34,7 +34,7 @@ #include "lib_errors.h" #include "xref.h" -XREF_SETUP() +XREF_SETUP(); DEFINE_HOOK(agentx_enabled, (), ()); diff --git a/lib/libfrr.h b/lib/libfrr.h index c1af59891..db0f36498 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -124,8 +124,8 @@ struct frr_daemon_info { __VA_ARGS__}; \ FRR_COREMOD_SETUP(.name = #execname, \ .description = #execname " daemon", \ - .version = FRR_VERSION, ) \ -/* end */ + .version = FRR_VERSION, ); \ + MACRO_REQUIRE_SEMICOLON() /* end */ extern void frr_init_vtydir(void); extern void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv); diff --git a/lib/module.c b/lib/module.c index e103493cf..d2491a347 100644 --- a/lib/module.c +++ b/lib/module.c @@ -43,7 +43,7 @@ union _frrmod_runtime_u frrmod_default = { }, }; -XREF_SETUP() +XREF_SETUP(); // if defined(HAVE_SYS_WEAK_ALIAS_ATTRIBUTE) // union _frrmod_runtime_u _frrmod_this_module diff --git a/lib/module.h b/lib/module.h index 5d8d9cfbc..6275877cb 100644 --- a/lib/module.h +++ b/lib/module.h @@ -79,12 +79,13 @@ extern union _frrmod_runtime_u _frrmod_this_module; NULL, \ &_frrmod_info, \ }}; \ - XREF_SETUP() \ - /* end */ + XREF_SETUP(); \ + MACRO_REQUIRE_SEMICOLON() /* end */ #define FRR_MODULE_SETUP(...) \ - FRR_COREMOD_SETUP(__VA_ARGS__) \ - DSO_SELF struct frrmod_runtime *frr_module = &_frrmod_this_module.r; + FRR_COREMOD_SETUP(__VA_ARGS__); \ + DSO_SELF struct frrmod_runtime *frr_module = &_frrmod_this_module.r; \ + MACRO_REQUIRE_SEMICOLON() /* end */ extern struct frrmod_runtime *frrmod_list; diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c index f3e701433..3d8771ffb 100644 --- a/lib/northbound_confd.c +++ b/lib/northbound_confd.c @@ -1483,4 +1483,5 @@ static int frr_confd_module_init(void) FRR_MODULE_SETUP(.name = "frr_confd", .version = FRR_VERSION, .description = "FRR ConfD integration module", - .init = frr_confd_module_init, ) + .init = frr_confd_module_init, +); diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp index abdae993b..d042e15da 100644 --- a/lib/northbound_grpc.cpp +++ b/lib/northbound_grpc.cpp @@ -1412,4 +1412,5 @@ static int frr_grpc_module_init(void) FRR_MODULE_SETUP(.name = "frr_grpc", .version = FRR_VERSION, .description = "FRR gRPC northbound module", - .init = frr_grpc_module_init, ) + .init = frr_grpc_module_init, +); diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c index 1c71312ac..9fc640cee 100644 --- a/lib/northbound_sysrepo.c +++ b/lib/northbound_sysrepo.c @@ -768,4 +768,5 @@ static int frr_sr_module_init(void) FRR_MODULE_SETUP(.name = "frr_sysrepo", .version = FRR_VERSION, .description = "FRR sysrepo integration module", - .init = frr_sr_module_init, ) + .init = frr_sr_module_init, +); diff --git a/lib/resolver.c b/lib/resolver.c index c01284e29..c2153e0a5 100644 --- a/lib/resolver.c +++ b/lib/resolver.c @@ -21,7 +21,7 @@ #include "command.h" #include "xref.h" -XREF_SETUP() +XREF_SETUP(); struct resolver_state { ares_channel channel; diff --git a/lib/xref.h b/lib/xref.h index b3243fa05..b1cb172b4 100644 --- a/lib/xref.h +++ b/lib/xref.h @@ -162,7 +162,7 @@ extern const struct xref * const __stop_xref_array[1] DSO_LOCAL; xref_block_add(&_xref_block); \ } \ asm(XREF_NOTE); \ - /* end */ + MACRO_REQUIRE_SEMICOLON() /* end */ /* the following blurb emits an ELF note indicating start and end of the xref * array in the binary. This is technically the "correct" entry point for |