*: fix northbound initializer warning on OpenBSD

For some reason, the compiler on OpenBSD on our CI boxes doesn't like
struct initializers with ".a.b = x, .a.c = y", generating a warning
about overwritten initializers...

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

1 files changed, 190 insertions, 94 deletions

diff --git a/ripd/rip_northbound.c b/ripd/rip_northbound.c
index d4fde5519..e0ddb9c46 100644
--- a/ripd/rip_northbound.c
+++ b/ripd/rip_northbound.c
@@ -1483,241 +1483,337 @@ const struct frr_yang_module_info frr_ripd_info = {
 	.nodes = {
 		{
 			.xpath = "/frr-ripd:ripd/instance",
-			.cbs.create = ripd_instance_create,
-			.cbs.destroy = ripd_instance_destroy,
-			.cbs.get_next = ripd_instance_get_next,
-			.cbs.get_keys = ripd_instance_get_keys,
-			.cbs.lookup_entry = ripd_instance_lookup_entry,
-			.cbs.cli_show = cli_show_router_rip,
+			.cbs = {
+				.cli_show = cli_show_router_rip,
+				.create = ripd_instance_create,
+				.destroy = ripd_instance_destroy,
+				.get_keys = ripd_instance_get_keys,
+				.get_next = ripd_instance_get_next,
+				.lookup_entry = ripd_instance_lookup_entry,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/allow-ecmp",
-			.cbs.modify = ripd_instance_allow_ecmp_modify,
-			.cbs.cli_show = cli_show_rip_allow_ecmp,
+			.cbs = {
+				.cli_show = cli_show_rip_allow_ecmp,
+				.modify = ripd_instance_allow_ecmp_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/default-information-originate",
-			.cbs.modify = ripd_instance_default_information_originate_modify,
-			.cbs.cli_show = cli_show_rip_default_information_originate,
+			.cbs = {
+				.cli_show = cli_show_rip_default_information_originate,
+				.modify = ripd_instance_default_information_originate_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/default-metric",
-			.cbs.modify = ripd_instance_default_metric_modify,
-			.cbs.cli_show = cli_show_rip_default_metric,
+			.cbs = {
+				.cli_show = cli_show_rip_default_metric,
+				.modify = ripd_instance_default_metric_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distance/default",
-			.cbs.modify = ripd_instance_distance_default_modify,
-			.cbs.cli_show = cli_show_rip_distance,
+			.cbs = {
+				.cli_show = cli_show_rip_distance,
+				.modify = ripd_instance_distance_default_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distance/source",
-			.cbs.create = ripd_instance_distance_source_create,
-			.cbs.destroy = ripd_instance_distance_source_destroy,
-			.cbs.cli_show = cli_show_rip_distance_source,
+			.cbs = {
+				.cli_show = cli_show_rip_distance_source,
+				.create = ripd_instance_distance_source_create,
+				.destroy = ripd_instance_distance_source_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distance/source/distance",
-			.cbs.modify = ripd_instance_distance_source_distance_modify,
+			.cbs = {
+				.modify = ripd_instance_distance_source_distance_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/distance/source/access-list",
-			.cbs.modify = ripd_instance_distance_source_access_list_modify,
-			.cbs.destroy = ripd_instance_distance_source_access_list_destroy,
+			.cbs = {
+				.destroy = ripd_instance_distance_source_access_list_destroy,
+				.modify = ripd_instance_distance_source_access_list_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/explicit-neighbor",
-			.cbs.create = ripd_instance_explicit_neighbor_create,
-			.cbs.destroy = ripd_instance_explicit_neighbor_destroy,
-			.cbs.cli_show = cli_show_rip_neighbor,
+			.cbs = {
+				.cli_show = cli_show_rip_neighbor,
+				.create = ripd_instance_explicit_neighbor_create,
+				.destroy = ripd_instance_explicit_neighbor_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/network",
-			.cbs.create = ripd_instance_network_create,
-			.cbs.destroy = ripd_instance_network_destroy,
-			.cbs.cli_show = cli_show_rip_network_prefix,
+			.cbs = {
+				.cli_show = cli_show_rip_network_prefix,
+				.create = ripd_instance_network_create,
+				.destroy = ripd_instance_network_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/interface",
-			.cbs.create = ripd_instance_interface_create,
-			.cbs.destroy = ripd_instance_interface_destroy,
-			.cbs.cli_show = cli_show_rip_network_interface,
+			.cbs = {
+				.cli_show = cli_show_rip_network_interface,
+				.create = ripd_instance_interface_create,
+				.destroy = ripd_instance_interface_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/offset-list",
-			.cbs.create = ripd_instance_offset_list_create,
-			.cbs.destroy = ripd_instance_offset_list_destroy,
-			.cbs.cli_show = cli_show_rip_offset_list,
+			.cbs = {
+				.cli_show = cli_show_rip_offset_list,
+				.create = ripd_instance_offset_list_create,
+				.destroy = ripd_instance_offset_list_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/offset-list/access-list",
-			.cbs.modify = ripd_instance_offset_list_access_list_modify,
+			.cbs = {
+				.modify = ripd_instance_offset_list_access_list_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/offset-list/metric",
-			.cbs.modify = ripd_instance_offset_list_metric_modify,
+			.cbs = {
+				.modify = ripd_instance_offset_list_metric_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/passive-default",
-			.cbs.modify = ripd_instance_passive_default_modify,
-			.cbs.cli_show = cli_show_rip_passive_default,
+			.cbs = {
+				.cli_show = cli_show_rip_passive_default,
+				.modify = ripd_instance_passive_default_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/passive-interface",
-			.cbs.create = ripd_instance_passive_interface_create,
-			.cbs.destroy = ripd_instance_passive_interface_destroy,
-			.cbs.cli_show = cli_show_rip_passive_interface,
+			.cbs = {
+				.cli_show = cli_show_rip_passive_interface,
+				.create = ripd_instance_passive_interface_create,
+				.destroy = ripd_instance_passive_interface_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/non-passive-interface",
-			.cbs.create = ripd_instance_non_passive_interface_create,
-			.cbs.destroy = ripd_instance_non_passive_interface_destroy,
-			.cbs.cli_show = cli_show_rip_non_passive_interface,
+			.cbs = {
+				.cli_show = cli_show_rip_non_passive_interface,
+				.create = ripd_instance_non_passive_interface_create,
+				.destroy = ripd_instance_non_passive_interface_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/redistribute",
-			.cbs.create = ripd_instance_redistribute_create,
-			.cbs.destroy = ripd_instance_redistribute_destroy,
-			.cbs.apply_finish = ripd_instance_redistribute_apply_finish,
-			.cbs.cli_show = cli_show_rip_redistribute,
+			.cbs = {
+				.apply_finish = ripd_instance_redistribute_apply_finish,
+				.cli_show = cli_show_rip_redistribute,
+				.create = ripd_instance_redistribute_create,
+				.destroy = ripd_instance_redistribute_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/redistribute/route-map",
-			.cbs.modify = ripd_instance_redistribute_route_map_modify,
-			.cbs.destroy = ripd_instance_redistribute_route_map_destroy,
+			.cbs = {
+				.destroy = ripd_instance_redistribute_route_map_destroy,
+				.modify = ripd_instance_redistribute_route_map_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/redistribute/metric",
-			.cbs.modify = ripd_instance_redistribute_metric_modify,
-			.cbs.destroy = ripd_instance_redistribute_metric_destroy,
+			.cbs = {
+				.destroy = ripd_instance_redistribute_metric_destroy,
+				.modify = ripd_instance_redistribute_metric_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/static-route",
-			.cbs.create = ripd_instance_static_route_create,
-			.cbs.destroy = ripd_instance_static_route_destroy,
-			.cbs.cli_show = cli_show_rip_route,
+			.cbs = {
+				.cli_show = cli_show_rip_route,
+				.create = ripd_instance_static_route_create,
+				.destroy = ripd_instance_static_route_destroy,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/timers",
-			.cbs.apply_finish = ripd_instance_timers_apply_finish,
-			.cbs.cli_show = cli_show_rip_timers,
+			.cbs = {
+				.apply_finish = ripd_instance_timers_apply_finish,
+				.cli_show = cli_show_rip_timers,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/timers/flush-interval",
-			.cbs.modify = ripd_instance_timers_flush_interval_modify,
+			.cbs = {
+				.modify = ripd_instance_timers_flush_interval_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/timers/holddown-interval",
-			.cbs.modify = ripd_instance_timers_holddown_interval_modify,
+			.cbs = {
+				.modify = ripd_instance_timers_holddown_interval_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/timers/update-interval",
-			.cbs.modify = ripd_instance_timers_update_interval_modify,
+			.cbs = {
+				.modify = ripd_instance_timers_update_interval_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/version",
-			.cbs.cli_show = cli_show_rip_version,
+			.cbs = {
+				.cli_show = cli_show_rip_version,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/version/receive",
-			.cbs.modify = ripd_instance_version_receive_modify,
+			.cbs = {
+				.modify = ripd_instance_version_receive_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/version/send",
-			.cbs.modify = ripd_instance_version_send_modify,
+			.cbs = {
+				.modify = ripd_instance_version_send_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/split-horizon",
-			.cbs.modify = lib_interface_rip_split_horizon_modify,
-			.cbs.cli_show = cli_show_ip_rip_split_horizon,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_split_horizon,
+				.modify = lib_interface_rip_split_horizon_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/v2-broadcast",
-			.cbs.modify = lib_interface_rip_v2_broadcast_modify,
-			.cbs.cli_show = cli_show_ip_rip_v2_broadcast,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_v2_broadcast,
+				.modify = lib_interface_rip_v2_broadcast_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/version-receive",
-			.cbs.modify = lib_interface_rip_version_receive_modify,
-			.cbs.cli_show = cli_show_ip_rip_receive_version,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_receive_version,
+				.modify = lib_interface_rip_version_receive_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/version-send",
-			.cbs.modify = lib_interface_rip_version_send_modify,
-			.cbs.cli_show = cli_show_ip_rip_send_version,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_send_version,
+				.modify = lib_interface_rip_version_send_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/authentication-scheme",
-			.cbs.cli_show = cli_show_ip_rip_authentication_scheme,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_authentication_scheme,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/authentication-scheme/mode",
-			.cbs.modify = lib_interface_rip_authentication_scheme_mode_modify,
+			.cbs = {
+				.modify = lib_interface_rip_authentication_scheme_mode_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/authentication-scheme/md5-auth-length",
-			.cbs.modify = lib_interface_rip_authentication_scheme_md5_auth_length_modify,
-			.cbs.destroy = lib_interface_rip_authentication_scheme_md5_auth_length_destroy,
+			.cbs = {
+				.destroy = lib_interface_rip_authentication_scheme_md5_auth_length_destroy,
+				.modify = lib_interface_rip_authentication_scheme_md5_auth_length_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/authentication-password",
-			.cbs.modify = lib_interface_rip_authentication_password_modify,
-			.cbs.destroy = lib_interface_rip_authentication_password_destroy,
-			.cbs.cli_show = cli_show_ip_rip_authentication_string,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_authentication_string,
+				.destroy = lib_interface_rip_authentication_password_destroy,
+				.modify = lib_interface_rip_authentication_password_modify,
+			},
 		},
 		{
 			.xpath = "/frr-interface:lib/interface/frr-ripd:rip/authentication-key-chain",
-			.cbs.modify = lib_interface_rip_authentication_key_chain_modify,
-			.cbs.destroy = lib_interface_rip_authentication_key_chain_destroy,
-			.cbs.cli_show = cli_show_ip_rip_authentication_key_chain,
+			.cbs = {
+				.cli_show = cli_show_ip_rip_authentication_key_chain,
+				.destroy = lib_interface_rip_authentication_key_chain_destroy,
+				.modify = lib_interface_rip_authentication_key_chain_modify,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor",
-			.cbs.get_next = ripd_instance_state_neighbors_neighbor_get_next,
-			.cbs.get_keys = ripd_instance_state_neighbors_neighbor_get_keys,
-			.cbs.lookup_entry = ripd_instance_state_neighbors_neighbor_lookup_entry,
+			.cbs = {
+				.get_keys = ripd_instance_state_neighbors_neighbor_get_keys,
+				.get_next = ripd_instance_state_neighbors_neighbor_get_next,
+				.lookup_entry = ripd_instance_state_neighbors_neighbor_lookup_entry,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/address",
-			.cbs.get_elem = ripd_instance_state_neighbors_neighbor_address_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_neighbors_neighbor_address_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/last-update",
-			.cbs.get_elem = ripd_instance_state_neighbors_neighbor_last_update_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_neighbors_neighbor_last_update_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/bad-packets-rcvd",
-			.cbs.get_elem = ripd_instance_state_neighbors_neighbor_bad_packets_rcvd_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_neighbors_neighbor_bad_packets_rcvd_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/neighbors/neighbor/bad-routes-rcvd",
-			.cbs.get_elem = ripd_instance_state_neighbors_neighbor_bad_routes_rcvd_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_neighbors_neighbor_bad_routes_rcvd_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/routes/route",
-			.cbs.get_next = ripd_instance_state_routes_route_get_next,
-			.cbs.get_keys = ripd_instance_state_routes_route_get_keys,
-			.cbs.lookup_entry = ripd_instance_state_routes_route_lookup_entry,
+			.cbs = {
+				.get_keys = ripd_instance_state_routes_route_get_keys,
+				.get_next = ripd_instance_state_routes_route_get_next,
+				.lookup_entry = ripd_instance_state_routes_route_lookup_entry,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/routes/route/prefix",
-			.cbs.get_elem = ripd_instance_state_routes_route_prefix_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_routes_route_prefix_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/routes/route/next-hop",
-			.cbs.get_elem = ripd_instance_state_routes_route_next_hop_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_routes_route_next_hop_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/routes/route/interface",
-			.cbs.get_elem = ripd_instance_state_routes_route_interface_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_routes_route_interface_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:ripd/instance/state/routes/route/metric",
-			.cbs.get_elem = ripd_instance_state_routes_route_metric_get_elem,
+			.cbs = {
+				.get_elem = ripd_instance_state_routes_route_metric_get_elem,
+			},
 		},
 		{
 			.xpath = "/frr-ripd:clear-rip-route",
-			.cbs.rpc = clear_rip_route_rpc,
+			.cbs = {
+				.rpc = clear_rip_route_rpc,
+			},
 		},
 		{
 			.xpath = NULL,