From bf8d3d6aca3f20255a621ed1c148fd05b3a8ae5c Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sun, 21 Feb 2021 06:18:10 +0100 Subject: *: require semicolon after DEFINE_MTYPE & co Back when I put this together in 2015, ISO C11 was still reasonably new and we couldn't require it just yet. Without ISO C11, there is no "good" way (only bad hacks) to require a semicolon after a macro that ends with a function definition. And if you added one anyway, you'd get "spurious semicolon" warnings on some compilers... With C11, `_Static_assert()` at the end of a macro will make it so that the semicolon is properly required, consumed, and not warned about. Consistently requiring semicolons after "file-level" macros matches Linux kernel coding style and helps some editors against mis-syntax'ing these macros. Signed-off-by: David Lamparter --- lib/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/module.c') diff --git a/lib/module.c b/lib/module.c index 3d299a6a2e..e103493cf5 100644 --- a/lib/module.c +++ b/lib/module.c @@ -27,8 +27,8 @@ #include "memory.h" #include "version.h" -DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name") -DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments") +DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name"); +DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments"); static struct frrmod_info frrmod_default_info = { .name = "libfrr", -- cgit v1.2.3 From 80413c2073a20774b264ab04f7a4ea4515699790 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sun, 21 Feb 2021 07:07:15 +0100 Subject: *: require semicolon after FRR_DAEMON_INFO & co. ... again ... Signed-off-by: David Lamparter --- babeld/babel_main.c | 2 +- bfdd/bfdd.c | 3 ++- bgpd/bgp_bmp.c | 3 ++- bgpd/bgp_main.c | 3 ++- bgpd/bgp_rpki.c | 3 ++- bgpd/bgp_snmp.c | 3 ++- doc/developer/modules.rst | 2 +- eigrpd/eigrp_main.c | 3 ++- isisd/isis_main.c | 3 ++- isisd/isis_snmp.c | 9 ++++++--- ldpd/ldp_snmp.c | 9 ++++++--- ldpd/ldpd.c | 2 +- lib/agentx.c | 2 +- lib/libfrr.h | 4 ++-- lib/module.c | 2 +- lib/module.h | 9 +++++---- lib/northbound_confd.c | 3 ++- lib/northbound_grpc.cpp | 3 ++- lib/northbound_sysrepo.c | 3 ++- lib/resolver.c | 2 +- lib/xref.h | 2 +- nhrpd/nhrp_main.c | 3 ++- ospf6d/ospf6_main.c | 3 ++- ospf6d/ospf6_snmp.c | 3 ++- ospfclient/ospf_apiclient.c | 2 +- ospfd/ospf_main.c | 3 ++- ospfd/ospf_snmp.c | 3 ++- pathd/path_main.c | 3 ++- pathd/path_pcep.c | 3 ++- pbrd/pbr_main.c | 3 ++- pimd/pim_main.c | 3 ++- ripd/rip_main.c | 3 ++- ripd/rip_snmp.c | 3 ++- ripngd/ripng_main.c | 3 ++- sharpd/sharp_main.c | 3 ++- staticd/static_main.c | 2 +- tests/lib/test_xref.c | 2 +- vrrpd/vrrp_main.c | 2 +- watchfrr/watchfrr.c | 3 ++- zebra/dplane_fpm_nl.c | 2 +- zebra/irdp_main.c | 3 ++- zebra/main.c | 3 ++- zebra/sample_plugin.c | 2 +- zebra/zebra_fpm.c | 3 ++- zebra/zebra_mlag_private.c | 2 +- zebra/zebra_snmp.c | 3 ++- 46 files changed, 89 insertions(+), 54 deletions(-) (limited to 'lib/module.c') diff --git a/babeld/babel_main.c b/babeld/babel_main.c index 14e583a35c..71ac356585 100644 --- a/babeld/babel_main.c +++ b/babeld/babel_main.c @@ -153,7 +153,7 @@ FRR_DAEMON_INFO(babeld, BABELD, .yang_modules = babeld_yang_modules, .n_yang_modules = array_size(babeld_yang_modules), - ) +); int main(int argc, char **argv) diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index 0285e63d6b..7a2c3cc3aa 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -134,7 +134,8 @@ FRR_DAEMON_INFO(bfdd, BFD, .vty_port = 2617, .signals = bfd_signals, .n_signals = array_size(bfd_signals), .privs = &bglobal.bfdd_privs, .yang_modules = bfdd_yang_modules, - .n_yang_modules = array_size(bfdd_yang_modules)) + .n_yang_modules = array_size(bfdd_yang_modules), +); #define OPTION_CTLSOCK 1001 #define OPTION_DPLANEADDR 2000 diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 4710a9a3f7..0e5f506b3a 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -2444,4 +2444,5 @@ static int bgp_bmp_module_init(void) FRR_MODULE_SETUP(.name = "bgpd_bmp", .version = FRR_VERSION, .description = "bgpd BMP module", - .init = bgp_bmp_module_init) + .init = bgp_bmp_module_init, +); diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 3cb3d06217..6b3df87515 100644 --- a/bgpd/bgp_main.c +++ b/bgpd/bgp_main.c @@ -394,7 +394,8 @@ FRR_DAEMON_INFO(bgpd, BGP, .vty_port = BGP_VTY_PORT, .signals = bgp_signals, .n_signals = array_size(bgp_signals), .privs = &bgpd_privs, .yang_modules = bgpd_yang_modules, - .n_yang_modules = array_size(bgpd_yang_modules), ) + .n_yang_modules = array_size(bgpd_yang_modules), +); #define DEPRECATED_OPTIONS "" diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index b053ec3761..9344384956 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -1471,4 +1471,5 @@ static void install_cli_commands(void) FRR_MODULE_SETUP(.name = "bgpd_rpki", .version = "0.3.6", .description = "Enable RPKI support for FRR.", - .init = bgp_rpki_module_init) + .init = bgp_rpki_module_init, +); diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 71868abc5f..bc26314b50 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -914,4 +914,5 @@ static int bgp_snmp_module_init(void) FRR_MODULE_SETUP(.name = "bgpd_snmp", .version = FRR_VERSION, .description = "bgpd AgentX SNMP module", - .init = bgp_snmp_module_init) + .init = bgp_snmp_module_init, +); diff --git a/doc/developer/modules.rst b/doc/developer/modules.rst index 02330ddfe4..e95f8a1b4a 100644 --- a/doc/developer/modules.rst +++ b/doc/developer/modules.rst @@ -76,7 +76,7 @@ Basic boilerplate: .version = "0.0", .description = "my module", .init = module_init, - ) + ); The ``frr_late_init`` hook will be called after the daemon has finished its other startup and is about to enter the main event loop; this is the diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index b1a6498cbc..0ed7e94968 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -155,7 +155,8 @@ FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT, .n_signals = array_size(eigrp_signals), .privs = &eigrpd_privs, .yang_modules = eigrpd_yang_modules, - .n_yang_modules = array_size(eigrpd_yang_modules), ) + .n_yang_modules = array_size(eigrpd_yang_modules), +); /* EIGRPd main routine. */ int main(int argc, char **argv, char **envp) diff --git a/isisd/isis_main.c b/isisd/isis_main.c index 1b04f4f7a0..c03cedb187 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -193,7 +193,8 @@ FRR_DAEMON_INFO(isisd, ISIS, .vty_port = ISISD_VTY_PORT, .n_signals = array_size(isisd_signals), .privs = &isisd_privs, .yang_modules = isisd_yang_modules, - .n_yang_modules = array_size(isisd_yang_modules), ) + .n_yang_modules = array_size(isisd_yang_modules), +); /* * Main routine of isisd. Parse arguments and handle IS-IS state machine. diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c index 50dc0f2a1c..522026dde4 100644 --- a/isisd/isis_snmp.c +++ b/isisd/isis_snmp.c @@ -3452,6 +3452,9 @@ static int isis_snmp_module_init(void) return 0; } -FRR_MODULE_SETUP(.name = "isis_snmp", .version = FRR_VERSION, - .description = "isis AgentX SNMP module", - .init = isis_snmp_module_init, ) +FRR_MODULE_SETUP( + .name = "isis_snmp", + .version = FRR_VERSION, + .description = "isis AgentX SNMP module", + .init = isis_snmp_module_init, +); diff --git a/ldpd/ldp_snmp.c b/ldpd/ldp_snmp.c index 97dde616a7..3f59d18aa8 100644 --- a/ldpd/ldp_snmp.c +++ b/ldpd/ldp_snmp.c @@ -1239,6 +1239,9 @@ static int ldp_snmp_module_init(void) return 0; } -FRR_MODULE_SETUP(.name = "ldp_snmp", .version = FRR_VERSION, - .description = "ldp AgentX SNMP module", - .init = ldp_snmp_module_init, ) +FRR_MODULE_SETUP( + .name = "ldp_snmp", + .version = FRR_VERSION, + .description = "ldp AgentX SNMP module", + .init = ldp_snmp_module_init, +); diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index d609ef4401..d69a4dcd3c 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -218,7 +218,7 @@ FRR_DAEMON_INFO(ldpd, LDP, .yang_modules = ldpd_yang_modules, .n_yang_modules = array_size(ldpd_yang_modules), -) +); static int ldp_config_fork_apply(struct thread *t) { diff --git a/lib/agentx.c b/lib/agentx.c index 3f1a8edbaa..b5a035ee2b 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 c1af598915..db0f364986 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 e103493cf5..d2491a3479 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 5d8d9cfbcc..6275877cb3 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 f3e7014338..3d8771ffbc 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 abdae993b1..d042e15dad 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 1c71312ac8..9fc640ceea 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 c01284e29e..c2153e0a5e 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 b3243fa058..b1cb172b41 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 diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 4cab58e481..5c819017f4 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -128,7 +128,8 @@ FRR_DAEMON_INFO(nhrpd, NHRP, .vty_port = NHRP_VTY_PORT, .signals = sighandlers, .n_signals = array_size(sighandlers), .privs = &nhrpd_privs, .yang_modules = nhrpd_yang_modules, - .n_yang_modules = array_size(nhrpd_yang_modules), ) + .n_yang_modules = array_size(nhrpd_yang_modules), +); int main(int argc, char **argv) { diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 69424f4b46..c601693a7e 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -182,7 +182,8 @@ FRR_DAEMON_INFO(ospf6d, OSPF6, .vty_port = OSPF6_VTY_PORT, .n_signals = array_size(ospf6_signals), .privs = &ospf6d_privs, .yang_modules = ospf6d_yang_modules, - .n_yang_modules = array_size(ospf6d_yang_modules), ) + .n_yang_modules = array_size(ospf6d_yang_modules), +); /* Main routine of ospf6d. Treatment of argument and starting ospf finite state machine is handled here. */ diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c index 51a3bff2a3..b9d413c3df 100644 --- a/ospf6d/ospf6_snmp.c +++ b/ospf6d/ospf6_snmp.c @@ -1418,4 +1418,5 @@ static int ospf6_snmp_module_init(void) FRR_MODULE_SETUP(.name = "ospf6d_snmp", .version = FRR_VERSION, .description = "ospf6d AgentX SNMP module", - .init = ospf6_snmp_module_init, ) + .init = ospf6_snmp_module_init, +); diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index a1d5f632c3..29f1c0807d 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -58,7 +58,7 @@ #include "ospfd/ospf_dump_api.c" #include "ospfd/ospf_api.c" -XREF_SETUP() +XREF_SETUP(); DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient"); DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client"); diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 6a90dbff11..9ae2e8b043 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -141,7 +141,8 @@ FRR_DAEMON_INFO(ospfd, OSPF, .vty_port = OSPF_VTY_PORT, .signals = ospf_signals, .n_signals = array_size(ospf_signals), .privs = &ospfd_privs, .yang_modules = ospfd_yang_modules, - .n_yang_modules = array_size(ospfd_yang_modules), ) + .n_yang_modules = array_size(ospfd_yang_modules), +); /* OSPFd main routine. */ int main(int argc, char **argv) diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 3f4ca44b05..8418bbf2b9 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -2565,4 +2565,5 @@ static int ospf_snmp_module_init(void) FRR_MODULE_SETUP(.name = "ospfd_snmp", .version = FRR_VERSION, .description = "ospfd AgentX SNMP module", - .init = ospf_snmp_module_init, ) + .init = ospf_snmp_module_init, +); diff --git a/pathd/path_main.c b/pathd/path_main.c index 8b7d4aba48..f54ab736c4 100644 --- a/pathd/path_main.c +++ b/pathd/path_main.c @@ -114,7 +114,8 @@ FRR_DAEMON_INFO(pathd, PATH, .vty_port = PATH_VTY_PORT, .signals = path_signals, .n_signals = array_size(path_signals), .privs = &pathd_privs, .yang_modules = pathd_yang_modules, - .n_yang_modules = array_size(pathd_yang_modules), ) + .n_yang_modules = array_size(pathd_yang_modules), +); int main(int argc, char **argv, char **envp) { diff --git a/pathd/path_pcep.c b/pathd/path_pcep.c index 8b5ca8aff3..5dcba965a2 100644 --- a/pathd/path_pcep.c +++ b/pathd/path_pcep.c @@ -317,4 +317,5 @@ int pcep_module_init(void) FRR_MODULE_SETUP(.name = "frr_pathd_pcep", .version = FRR_VERSION, .description = "FRR pathd PCEP module", - .init = pcep_module_init) + .init = pcep_module_init, +); diff --git a/pbrd/pbr_main.c b/pbrd/pbr_main.c index 01c52f24e5..1badaf95bd 100644 --- a/pbrd/pbr_main.c +++ b/pbrd/pbr_main.c @@ -131,7 +131,8 @@ FRR_DAEMON_INFO(pbrd, PBR, .vty_port = PBR_VTY_PORT, .privs = &pbr_privs, .yang_modules = pbrd_yang_modules, - .n_yang_modules = array_size(pbrd_yang_modules), ) + .n_yang_modules = array_size(pbrd_yang_modules), +); int main(int argc, char **argv, char **envp) { diff --git a/pimd/pim_main.c b/pimd/pim_main.c index 5a09e7a8ee..70c233848a 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -92,7 +92,8 @@ FRR_DAEMON_INFO(pimd, PIM, .vty_port = PIMD_VTY_PORT, .n_signals = 4 /* XXX array_size(pimd_signals) XXX*/, .privs = &pimd_privs, .yang_modules = pimd_yang_modules, - .n_yang_modules = array_size(pimd_yang_modules), ) + .n_yang_modules = array_size(pimd_yang_modules), +); int main(int argc, char **argv, char **envp) diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 7e381887fc..2e5eec9844 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -128,7 +128,8 @@ FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT, .signals = ripd_signals, .n_signals = array_size(ripd_signals), .privs = &ripd_privs, .yang_modules = ripd_yang_modules, - .n_yang_modules = array_size(ripd_yang_modules), ) + .n_yang_modules = array_size(ripd_yang_modules), +); #define DEPRECATED_OPTIONS "" diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c index 4e6ed1400f..37bce7484c 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -589,4 +589,5 @@ static int rip_snmp_module_init(void) FRR_MODULE_SETUP(.name = "ripd_snmp", .version = FRR_VERSION, .description = "ripd AgentX SNMP module", - .init = rip_snmp_module_init, ) + .init = rip_snmp_module_init, +); diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c index 010bac851b..a5d837aa55 100644 --- a/ripngd/ripng_main.c +++ b/ripngd/ripng_main.c @@ -131,7 +131,8 @@ FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT, .privs = &ripngd_privs, .yang_modules = ripngd_yang_modules, - .n_yang_modules = array_size(ripngd_yang_modules), ) + .n_yang_modules = array_size(ripngd_yang_modules), +); #define DEPRECATED_OPTIONS "" diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index c273d32085..a1216247c0 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -129,7 +129,8 @@ FRR_DAEMON_INFO(sharpd, SHARP, .vty_port = SHARP_VTY_PORT, .n_signals = array_size(sharp_signals), .privs = &sharp_privs, .yang_modules = sharpd_yang_modules, - .n_yang_modules = array_size(sharpd_yang_modules), ) + .n_yang_modules = array_size(sharpd_yang_modules), +); struct sharp_global sg; diff --git a/staticd/static_main.c b/staticd/static_main.c index 560814771d..1561b91efb 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -129,7 +129,7 @@ FRR_DAEMON_INFO(staticd, STATIC, .vty_port = STATIC_VTY_PORT, .privs = &static_privs, .yang_modules = staticd_yang_modules, .n_yang_modules = array_size(staticd_yang_modules), -) +); int main(int argc, char **argv, char **envp) { diff --git a/tests/lib/test_xref.c b/tests/lib/test_xref.c index 700950de1f..aa179141af 100644 --- a/tests/lib/test_xref.c +++ b/tests/lib/test_xref.c @@ -127,7 +127,7 @@ bool (*tests[])(void) = { test_logcall, }; -XREF_SETUP() +XREF_SETUP(); int main(int argc, char **argv) { diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index 6d6ca1f631..a5ad37aa0c 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -128,7 +128,7 @@ FRR_DAEMON_INFO(vrrpd, VRRP, .vty_port = VRRP_VTY_PORT, .privs = &vrrp_privs, .yang_modules = vrrp_yang_modules, .n_yang_modules = array_size(vrrp_yang_modules), -) +); int main(int argc, char **argv, char **envp) { diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index c5ac485565..faf1777d7f 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -1336,7 +1336,8 @@ FRR_DAEMON_INFO(watchfrr, WATCHFRR, .signals = watchfrr_signals, .n_signals = array_size(watchfrr_signals), - .privs = &watchfrr_privs, ) + .privs = &watchfrr_privs, +); #define DEPRECATED_OPTIONS "aAezR:" diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c index 79a5d148a6..9abed77fa6 100644 --- a/zebra/dplane_fpm_nl.c +++ b/zebra/dplane_fpm_nl.c @@ -1517,4 +1517,4 @@ FRR_MODULE_SETUP( .version = "0.0.1", .description = "Data plane plugin for FPM using netlink.", .init = fpm_nl_init, - ) +); diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 936206641f..6a943a2e2b 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -349,4 +349,5 @@ static int irdp_module_init(void) } FRR_MODULE_SETUP(.name = "zebra_irdp", .version = FRR_VERSION, - .description = "zebra IRDP module", .init = irdp_module_init, ) + .description = "zebra IRDP module", .init = irdp_module_init, +); diff --git a/zebra/main.c b/zebra/main.c index 55fd3244cb..f2fde35f0e 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -274,7 +274,8 @@ FRR_DAEMON_INFO( .privs = &zserv_privs, .yang_modules = zebra_yang_modules, - .n_yang_modules = array_size(zebra_yang_modules), ) + .n_yang_modules = array_size(zebra_yang_modules), +); /* Main startup routine. */ int main(int argc, char **argv) diff --git a/zebra/sample_plugin.c b/zebra/sample_plugin.c index 464205f2f3..e54186bc18 100644 --- a/zebra/sample_plugin.c +++ b/zebra/sample_plugin.c @@ -130,4 +130,4 @@ FRR_MODULE_SETUP( .version = "0.0.1", .description = "Dataplane Sample Plugin", .init = module_init, - ) +); diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c index 099ac1434b..4882397dd3 100644 --- a/zebra/zebra_fpm.c +++ b/zebra/zebra_fpm.c @@ -2046,4 +2046,5 @@ static int zebra_fpm_module_init(void) FRR_MODULE_SETUP(.name = "zebra_fpm", .version = FRR_VERSION, .description = "zebra FPM (Forwarding Plane Manager) module", - .init = zebra_fpm_module_init, ) + .init = zebra_fpm_module_init, +); diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c index 8a66d6de72..aaf93b4dc1 100644 --- a/zebra/zebra_mlag_private.c +++ b/zebra/zebra_mlag_private.c @@ -297,4 +297,4 @@ FRR_MODULE_SETUP( .version = FRR_VERSION, .description = "zebra Cumulus MLAG interface", .init = zebra_mlag_module_init, -) +); diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index 89b8238c29..3e08d83724 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -566,4 +566,5 @@ static int zebra_snmp_module_init(void) FRR_MODULE_SETUP(.name = "zebra_snmp", .version = FRR_VERSION, .description = "zebra AgentX SNMP module", - .init = zebra_snmp_module_init, ) + .init = zebra_snmp_module_init, +); -- cgit v1.2.3