*: require semicolon after FRR_DAEMON_INFO & co.

... again ...

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 14e583a35ce723d00ebb8ebf138eb06f88870b3f..71ac35658545654b3d9342cd5970ca49dfc238cf 100644 (file)
--- 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 0285e63d6bf6fc883c4ffd1373cfae433e2ff2c5..7a2c3cc3aa1305899f3b7b323b3601ec1a381058 100644 (file)
--- 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 4710a9a3f7b2ac76b14f08138a8fb077fd5c88f5..0e5f506b3aef1b0dafb295ca2c34aa93df2b4469 100644 (file)
--- 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 3cb3d06217a3884288688b6f175532c16d4639ed..6b3df875156b5150474bd79a0e76e7b9961e7d25 100644 (file)
--- 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 b053ec37611bbb65d328f0770eddf2f9ed63da19..9344384956ab7f65f308b91c54e19122e3b681e4 100644 (file)
--- 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 71868abc5f667bb946200c6803f2bbc8519cc36d..bc26314b50cb72a2e77363210c90b89b181f3853 100644 (file)
--- 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 02330ddfe4503538e10bc13cf5fef5e34bf4fb84..e95f8a1b4a72eebd2f63c95b30f5e801056bd2bd 100644 (file)
--- 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 b1a6498cbcb189dc43ddf8e7b47e250e07b3d188..0ed7e94968f7f3ff768a5f5b3d02cccdf2aab152 100644 (file)
--- 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 1b04f4f7a0938112ac0e08ee361fdb4f81001c32..c03cedb1872e9416ab7c0715b01fef986369318c 100644 (file)
--- 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 50dc0f2a1c64e2fea9b9924fb854325c1d518a7a..522026dde4ef32fefdfdca3e787c46e25f3e9d48 100644 (file)
--- 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 97dde616a78c524c2f5a1977514125b0e6836a96..3f59d18aa8e76da640eacc1c620ea635fefaa4b5 100644 (file)
--- 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 d609ef4401fd8386079b6c8d403ed82eaafb8958..d69a4dcd3c5ade83093b3241c41584a17abb9aa8 100644 (file)
--- 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 3f1a8edbaa53a4617c28295072e3c9ed6b83608a..b5a035ee2be81e31ad558fb4c8760022691ae096 100644 (file)
--- 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 c1af59891582cf4d6e88d2e8ef76b87605dcf040..db0f36498668c9d7ea8061539fcc3cfd5b312480 100644 (file)
--- 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 e103493cf59198206efeb51af4c1e7cb26cc8292..d2491a34797cd86c8aab91f0e084834557976e4c 100644 (file)
--- 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 5d8d9cfbcc2126625555f7c2815cca095ca41742..6275877cb37423e6b9919202f0cafaded6cba5bf 100644 (file)
--- 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 f3e7014338b79c02cc2fa8cf4a34b30a0d6aff64..3d8771ffbce0b6f62bd994d7db90aa75c2efd77d 100644 (file)
--- 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 abdae993b10fe55ededc88f323a62a32e7f237ff..d042e15dad302ffe64ab8c620654e4615bbf2398 100644 (file)
--- 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 1c71312ac84423f03ebd4490b02f369a4b62d59b..9fc640ceea2dee016de070bb8e81804e91fb2681 100644 (file)
--- 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 c01284e29e10103187d8a40b2fd3df26706b21bc..c2153e0a5e4481444e129e252a2ec3269c54c052 100644 (file)
--- 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 b3243fa058daa2ea6498d1030e9cf3139c17e101..b1cb172b410d3e260a535a70ce9b03c43b7b0549 100644 (file)
--- 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 4cab58e4816909a5787f46277770ea2a52d610b7..5c819017f499911ee2edd247ae17b6ece80ccbd5 100644 (file)
--- 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 69424f4b46cb4f9710cd0c139bc77f6b8a78101c..c601693a7e4167c7697247e44fbcc87bfee2865f 100644 (file)
--- 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 51a3bff2a38685ccf83418a60a19d09a343b7c09..b9d413c3df7d1f8fa209d94bf2509c9451641ab9 100644 (file)
--- 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 a1d5f632c3cf09b168d1a8fbe659d6b32314b9cf..29f1c0807db47618833837a2f0d98e1ac252c88b 100644 (file)
--- 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 6a90dbff115a274d29528d18993efc42951287d2..9ae2e8b043e3937648561757e0ba14d820b01ab4 100644 (file)
--- 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 3f4ca44b0504b187fc481bf933d5074cb35366ab..8418bbf2b948ef5c6262393ddbfdc6022a841e5e 100644 (file)
--- 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 8b7d4aba4863d35c9c8cd6a7b292e853593202bf..f54ab736c4b948da317e5f75beadd4a649976a81 100644 (file)
--- 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 8b5ca8aff3b4cb685e9f93834e0b0fe73d05b3ad..5dcba965a298a599de4fbda4477f5daa70d9517a 100644 (file)
--- 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 01c52f24e53c95cc7e36361f7061c030fd1ba04d..1badaf95bddf0a8bd25d71304fab4a89819e3b04 100644 (file)
--- 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 5a09e7a8ee4d9761b736f5a5c49a0cd297843f81..70c233848a8b1ae601e90b3302e32a43de013122 100644 (file)
--- 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 7e381887fcbc41ba1ad432406f09e0ae5c36d487..2e5eec98448a1452d6d17f37b6a06930e9af3c10 100644 (file)
--- 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 4e6ed1400fce1448f809ea4d40f0041454fc4ec7..37bce7484cc1582a356880d195dd8eda2cd94e0f 100644 (file)
--- 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 010bac851b66f545d6ae9a80c87152a0b7cd57b8..a5d837aa5566a51f9c328b8a558c8def54b622b2 100644 (file)
--- 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 c273d32085a929d39be738e8d2f9e13d77c98c84..a1216247c0f9a7734094323303dad9ac819b83ea 100644 (file)
--- 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 560814771d8e239a7ca560800ab6bc408d6b35be..1561b91efb7d839220439d6826c95db5f88524dc 100644 (file)
--- 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 700950de1fcd15823a98e9cd183ac05cddb9c06c..aa179141af0e7dbf105d4d5563959df9e6916f5b 100644 (file)
--- 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 6d6ca1f631751f47a8538a2697585db023c8eb03..a5ad37aa0c3ba2d3ab345e1af5cc154646a395e3 100644 (file)
--- 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 c5ac4855651ae38a0ef9b0d05e1910c12bffdb95..faf1777d7fd8922a5280da7c0b5783349853515b 100644 (file)
--- 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 79a5d148a6732ed2610e257dde63a8ec6a9d8440..9abed77fa61bfcc7a76a804942b3e34eee12f5ee 100644 (file)
--- 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 936206641f9dcf7a9ce436c83a99ebe3cf84b5c1..6a943a2e2bd15fe43f927edbb174363160381c26 100644 (file)
--- 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 55fd3244cb022c89bb1bbbcc0509d09424f47016..f2fde35f0ee88e70bc9f218eeb5639f3523dcada 100644 (file)
--- 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 464205f2f364aa77969f90e3eadad63415d6446d..e54186bc182be07e28795a5965aeb4a95b44d3cb 100644 (file)
--- 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 099ac1434bf4938953fb079eeb59a7321b9f01c0..4882397dd3b4854f090857fd6ac137ed0bbca10c 100644 (file)
--- 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 8a66d6de726a99e90f810a56598c2b0f5d0ce358..aaf93b4dc17ffd7429ecd77d6a4f25117bec917e 100644 (file)
--- 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 89b8238c29386401e8f2b302c92f24f771c58729..3e08d83724454a66daba0190df6ccc5e1c90a09c 100644 (file)
--- 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,
+);