*: clean up cmd_node initializers

... and use named assignments everywhere (so I can change the struct.) Signed-off-by: David Lamparter <equinox@diac24.net>
louis-6wind · Apr 16, 2020 · 62b346e · 62b346e
1 parent 4c749d9
commit 62b346e
Show file tree

Hide file tree

Showing 51 changed files with 604 additions and 249 deletions.
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
@@ -58,11 +58,10 @@ static void babel_interface_free (babel_interface_nfo *bi);
 
 
 static vector babel_enable_if;                 /* enable interfaces (by cmd). */
-static struct cmd_node babel_interface_node =  /* babeld's interface node.    */
-{
-    INTERFACE_NODE,
-    "%s(config-if)# ",
-    1 /* VTYSH */
+static struct cmd_node babel_interface_node = {
+    .node = INTERFACE_NODE,
+    .prompt = "%s(config-if)# ",
+    .vtysh = 1,
 };
 
 

diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
@@ -886,15 +886,15 @@ DEFUN_NOSH(show_debugging_bfd,
 }
 
 struct cmd_node bfd_node = {
-	BFD_NODE,
-	"%s(config-bfd)# ",
-	1,
+	.node = BFD_NODE,
+	.prompt = "%s(config-bfd)# ",
+	.vtysh = 1,
 };
 
 struct cmd_node bfd_peer_node = {
-	BFD_PEER_NODE,
-	"%s(config-bfd-peer)# ",
-	1,
+	.node = BFD_PEER_NODE,
+	.prompt = "%s(config-bfd-peer)# ",
+	.vtysh = 1,
 };
 
 static int bfdd_write_config(struct vty *vty)

diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
@@ -1772,7 +1772,10 @@ static void bmp_active_setup(struct bmp_active *ba)
 	}
 }
 
-static struct cmd_node bmp_node = {BMP_NODE, "%s(config-bgp-bmp)# "};
+static struct cmd_node bmp_node = {
+	.node = BMP_NODE,
+	.prompt = "%s(config-bgp-bmp)# "
+};
 
 #define BMP_STR "BGP Monitoring Protocol\n"
 

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
@@ -2282,7 +2282,11 @@ static int bgp_config_write_debug(struct vty *vty)
 	return write;
 }
 
-static struct cmd_node debug_node = {DEBUG_NODE, "", 1};
+static struct cmd_node debug_node = {
+	.node = DEBUG_NODE,
+	.prompt = "",
+	.vtysh = 1,
+};
 
 void bgp_debug_init(void)
 {

diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
@@ -778,7 +778,11 @@ DEFUN (no_dump_bgp_all,
 }
 
 /* BGP node structure. */
-static struct cmd_node bgp_dump_node = {DUMP_NODE, "", 1};
+static struct cmd_node bgp_dump_node = {
+	.node = DUMP_NODE,
+	.prompt = "",
+	.vtysh = 1,
+};
 
 #if 0
 char *

diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
@@ -667,7 +667,11 @@ static int config_write_as_list(struct vty *vty)
 	return write;
 }
 
-static struct cmd_node as_list_node = {AS_LIST_NODE, "", 1};
+static struct cmd_node as_list_node = {
+	.node = AS_LIST_NODE,
+	.prompt = "",
+	.vtysh = 1,
+};
 
 /* Register functions. */
 void bgp_filter_init(void)

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
@@ -143,7 +143,11 @@ static unsigned int retry_interval;
 static int rpki_sync_socket_rtr;
 static int rpki_sync_socket_bgpd;
 
-static struct cmd_node rpki_node = {RPKI_NODE, "%s(config-rpki)# ", 1};
+static struct cmd_node rpki_node = {
+	.node = RPKI_NODE,
+	.prompt = "%s(config-rpki)# ",
+	.vtysh = 1,
+};
 static const struct route_map_rule_cmd route_match_rpki_cmd = {
 	"rpki", route_match, route_match_compile, route_match_free};
 

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
@@ -15335,50 +15335,82 @@ int bgp_config_write(struct vty *vty)
 
 /* BGP node structure. */
 static struct cmd_node bgp_node = {
-	BGP_NODE, "%s(config-router)# ", 1,
+	.node = BGP_NODE,
+	.prompt = "%s(config-router)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_unicast_node = {
-	BGP_IPV4_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV4_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_multicast_node = {
-	BGP_IPV4M_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV4M_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv4_labeled_unicast_node = {
-	BGP_IPV4L_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV4L_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_unicast_node = {
-	BGP_IPV6_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV6_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_multicast_node = {
-	BGP_IPV6M_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV6M_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
 static struct cmd_node bgp_ipv6_labeled_unicast_node = {
-	BGP_IPV6L_NODE, "%s(config-router-af)# ", 1,
+	.node = BGP_IPV6L_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
 };
 
-static struct cmd_node bgp_vpnv4_node = {BGP_VPNV4_NODE,
-					 "%s(config-router-af)# ", 1};
+static struct cmd_node bgp_vpnv4_node = {
+	.node = BGP_VPNV4_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
+};
 
-static struct cmd_node bgp_vpnv6_node = {BGP_VPNV6_NODE,
-					 "%s(config-router-af-vpnv6)# ", 1};
+static struct cmd_node bgp_vpnv6_node = {
+	.node = BGP_VPNV6_NODE,
+	.prompt = "%s(config-router-af-vpnv6)# ",
+	.vtysh = 1,
+};
 
-static struct cmd_node bgp_evpn_node = {BGP_EVPN_NODE,
-					"%s(config-router-evpn)# ", 1};
+static struct cmd_node bgp_evpn_node = {
+	.node = BGP_EVPN_NODE,
+	.prompt = "%s(config-router-evpn)# ",
+	.vtysh = 1,
+};
 
-static struct cmd_node bgp_evpn_vni_node = {BGP_EVPN_VNI_NODE,
-					    "%s(config-router-af-vni)# ", 1};
+static struct cmd_node bgp_evpn_vni_node = {
+	.node = BGP_EVPN_VNI_NODE,
+	.prompt = "%s(config-router-af-vni)# ",
+	.vtysh = 1,
+};
 
-static struct cmd_node bgp_flowspecv4_node = {BGP_FLOWSPECV4_NODE,
-					 "%s(config-router-af)# ", 1};
+static struct cmd_node bgp_flowspecv4_node = {
+	.node = BGP_FLOWSPECV4_NODE,
+	.prompt = "%s(config-router-af)# ",
+	.vtysh = 1,
+};
 
-static struct cmd_node bgp_flowspecv6_node = {BGP_FLOWSPECV6_NODE,
-					 "%s(config-router-af-vpnv6)# ", 1};
+static struct cmd_node bgp_flowspecv6_node = {
+	.node = BGP_FLOWSPECV6_NODE,
+	.prompt = "%s(config-router-af-vpnv6)# ",
+	.vtysh = 1,
+};
 
 static void community_list_vty(void);
 
@@ -17859,7 +17891,9 @@ static int community_list_config_write(struct vty *vty)
 }
 
 static struct cmd_node community_list_node = {
-	COMMUNITY_LIST_NODE, "", 1 /* Export to vtysh.  */
+	.node = COMMUNITY_LIST_NODE,
+	.prompt = "",
+	.vtysh = 1,
 };
 
 static void community_list_vty(void)

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2965,10 +2965,16 @@ DEFUN_NOSH (exit_vnc,
 }
 
 static struct cmd_node bgp_vnc_defaults_node = {
-	BGP_VNC_DEFAULTS_NODE, "%s(config-router-vnc-defaults)# ", 1};
+	.node = BGP_VNC_DEFAULTS_NODE,
+	.prompt = "%s(config-router-vnc-defaults)# ",
+	.vtysh = 1,
+};
 
 static struct cmd_node bgp_vnc_nve_group_node = {
-	BGP_VNC_NVE_GROUP_NODE, "%s(config-router-vnc-nve-group)# ", 1};
+	.node = BGP_VNC_NVE_GROUP_NODE,
+	.prompt = "%s(config-router-vnc-nve-group)# ",
+	.vtysh = 1,
+};
 
 /*-------------------------------------------------------------------------
  *			VNC nve-group
@@ -3388,7 +3394,10 @@ DEFUN_NOSH (exit_vrf_policy,
 }
 
 static struct cmd_node bgp_vrf_policy_node = {
-	BGP_VRF_POLICY_NODE, "%s(config-router-vrf-policy)# ", 1};
+	.node = BGP_VRF_POLICY_NODE,
+	.prompt = "%s(config-router-vrf-policy)# ",
+	.vtysh = 1,
+};
 
 /*-------------------------------------------------------------------------
  *			vnc-l2-group
@@ -3624,7 +3633,10 @@ DEFUN (vnc_l2_group_rt,
 
 
 static struct cmd_node bgp_vnc_l2_group_node = {
-	BGP_VNC_L2_GROUP_NODE, "%s(config-router-vnc-l2-group)# ", 1};
+	.node = BGP_VNC_L2_GROUP_NODE,
+	.prompt = "%s(config-router-vnc-l2-group)# ",
+	.vtysh = 1,
+};
 
 struct rfapi_l2_group_cfg *
 bgp_rfapi_get_group_by_lni_label(struct bgp *bgp, uint32_t logical_net_id,

diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
@@ -173,7 +173,11 @@ static int bgp_vnc_config_write_debug(struct vty *vty)
 	return write;
 }
 
-static struct cmd_node debug_node = {DEBUG_VNC_NODE, "", 1};
+static struct cmd_node debug_node = {
+	.node = DEBUG_VNC_NODE,
+	.prompt = "",
+	.vtysh = 1,
+};
 
 void vnc_debug_init(void)
 {

diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c
@@ -838,7 +838,11 @@ void eigrp_cli_show_keychain(struct vty *vty, struct lyd_node *dnode,
 /*
  * CLI installation procedures.
  */
-static struct cmd_node eigrp_node = {EIGRP_NODE, "%s(config-router)# ", 1};
+static struct cmd_node eigrp_node = {
+	.node = EIGRP_NODE,
+	.prompt = "%s(config-router)# ",
+	.vtysh = 1,
+};
 
 static int eigrp_config_write(struct vty *vty)
 {
@@ -854,8 +858,11 @@ static int eigrp_config_write(struct vty *vty)
 	return written;
 }
 
-static struct cmd_node eigrp_interface_node = {INTERFACE_NODE,
-					       "%s(config-if)# ", 1};
+static struct cmd_node eigrp_interface_node = {
+	.node = INTERFACE_NODE,
+	.prompt = "%s(config-if)# ",
+	.vtysh = 1,
+};
 
 
 static int eigrp_write_interface(struct vty *vty)

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
@@ -556,7 +556,9 @@ DEFUN (no_debug_eigrp_packets,
 
 /* Debug node. */
 static struct cmd_node eigrp_debug_node = {
-	DEBUG_NODE, "", 1 /* VTYSH */
+	.node = DEBUG_NODE,
+	.prompt = "",
+	.vtysh = 1,
 };
 
 /* Initialize debug commands. */

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
@@ -1336,7 +1336,9 @@ ferr_r isis_circuit_passwd_hmac_md5_set(struct isis_circuit *circuit,
 }
 
 struct cmd_node interface_node = {
-	INTERFACE_NODE, "%s(config-if)# ", 1,
+	.node = INTERFACE_NODE,
+	.prompt = "%s(config-if)# ",
+	.vtysh = 1,
 };
 
 void isis_circuit_circ_type_set(struct isis_circuit *circuit, int circ_type)

diff --git a/isisd/isisd.c b/isisd/isisd.c
@@ -785,7 +785,11 @@ DEFUN_NOSH (show_debugging,
 }
 
 /* Debug node. */
-static struct cmd_node debug_node = {DEBUG_NODE, "", 1};
+static struct cmd_node debug_node = {
+	.node = DEBUG_NODE,
+	.prompt = "",
+	.vtysh = 1,
+};
 
 static int config_write_debug(struct vty *vty)
 {
@@ -2141,7 +2145,11 @@ int isis_config_write(struct vty *vty)
 }
 #endif /* ifdef FABRICD */
 
-struct cmd_node router_node = {ROUTER_NODE, "%s(config-router)# ", 1};
+struct cmd_node router_node = {
+	.node = ROUTER_NODE,
+	.prompt = "%s(config-router)# ",
+	.vtysh = 1,
+};
 
 void isis_init(void)
 {

diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c
@@ -30,11 +30,10 @@ struct ldp_debug conf_ldp_debug;
 struct ldp_debug ldp_debug;
 
 /* Debug node. */
-struct cmd_node ldp_debug_node =
-{
-	DEBUG_NODE,
-	"",
-	1
+struct cmd_node ldp_debug_node = {
+	.node = DEBUG_NODE,
+	.prompt = "",
+	.vtysh = 1,
 };
 
 int