*: require semicolon after FRR_DAEMON_INFO & co.

... again ...

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

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)

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

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,
+);

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 ""
 

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,
+);

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,
+);

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

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)

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.

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,
+);

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,
+);

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)
 {

lib/agentx.c

@@ -34,7 +34,7 @@
 #include "lib_errors.h"
 #include "xref.h"
 
-XREF_SETUP()
+XREF_SETUP();
 
 DEFINE_HOOK(agentx_enabled, (), ());
 

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);

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

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;
 

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,
+);

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,
+);

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,
+);

lib/resolver.c

@@ -21,7 +21,7 @@
 #include "command.h"
 #include "xref.h"
 
-XREF_SETUP()
+XREF_SETUP();
 
 struct resolver_state {
 	ares_channel channel;

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

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)
 {

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. */

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,
+);

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");

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)

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,
+);

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)
 {

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,
+);

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)
 {

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)

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 ""
 

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,
+);

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 ""
 

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;
 

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)
 {

tests/lib/test_xref.c

@@ -127,7 +127,7 @@ bool (*tests[])(void) = {
 	test_logcall,
 };
 
-XREF_SETUP()
+XREF_SETUP();
 
 int main(int argc, char **argv)
 {

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)
 {

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:"
 

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,
-	)
+);

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,
+);

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)

zebra/sample_plugin.c

@@ -130,4 +130,4 @@ FRR_MODULE_SETUP(
 	.version = "0.0.1",
 	.description = "Dataplane Sample Plugin",
 	.init = module_init,
-	)
+);

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,
+);

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,
-)
+);

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,
+);