diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-09-08 21:46:23 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2020-04-16 12:53:00 +0200 |
| commit | 62b346eefa1b9e09c9372f5b6376e1bca4162015 (patch) | |
| tree | 2e3bc16d1d0765ab033c7ffd24ca58b3b5d35168 /ldpd/ldp_vty_conf.c | |
| parent | Merge pull request #6237 from ton31337/fix/show_hostname_in_bgp (diff) | |
| download | frr-62b346eefa1b9e09c9372f5b6376e1bca4162015.tar.xz frr-62b346eefa1b9e09c9372f5b6376e1bca4162015.zip | |
*: clean up cmd_node initializers
... and use named assignments everywhere (so I can change the struct.)
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ldpd/ldp_vty_conf.c')
| -rw-r--r-- | ldpd/ldp_vty_conf.c | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c index 84a5c0b1b..3b8c3404e 100644 --- a/ldpd/ldp_vty_conf.c +++ b/ldpd/ldp_vty_conf.c @@ -37,53 +37,46 @@ static void ldp_l2vpn_pw_config_write(struct vty *, struct l2vpn_pw *); static int ldp_vty_get_af(struct vty *); static int ldp_iface_is_configured(struct ldpd_conf *, const char *); -struct cmd_node ldp_node = -{ - LDP_NODE, - "%s(config-ldp)# ", - 1, +struct cmd_node ldp_node = { + .node = LDP_NODE, + .prompt = "%s(config-ldp)# ", + .vtysh = 1, }; -struct cmd_node ldp_ipv4_node = -{ - LDP_IPV4_NODE, - "%s(config-ldp-af)# ", - 1, +struct cmd_node ldp_ipv4_node = { + .node = LDP_IPV4_NODE, + .prompt = "%s(config-ldp-af)# ", + .vtysh = 1, }; -struct cmd_node ldp_ipv6_node = -{ - LDP_IPV6_NODE, - "%s(config-ldp-af)# ", - 1, +struct cmd_node ldp_ipv6_node = { + .node = LDP_IPV6_NODE, + .prompt = "%s(config-ldp-af)# ", + .vtysh = 1, }; -struct cmd_node ldp_ipv4_iface_node = -{ - LDP_IPV4_IFACE_NODE, - "%s(config-ldp-af-if)# ", - 1, +struct cmd_node ldp_ipv4_iface_node = { + .node = LDP_IPV4_IFACE_NODE, + .prompt = "%s(config-ldp-af-if)# ", + .vtysh = 1, }; -struct cmd_node ldp_ipv6_iface_node = -{ - LDP_IPV6_IFACE_NODE, - "%s(config-ldp-af-if)# ", - 1, +struct cmd_node ldp_ipv6_iface_node = { + .node = LDP_IPV6_IFACE_NODE, + .prompt = "%s(config-ldp-af-if)# ", + .vtysh = 1, }; -struct cmd_node ldp_l2vpn_node = -{ - LDP_L2VPN_NODE, - "%s(config-l2vpn)# ", - 1, +struct cmd_node ldp_l2vpn_node = { + .node = LDP_L2VPN_NODE, + .prompt = "%s(config-l2vpn)# ", + .vtysh = 1, }; -struct cmd_node ldp_pseudowire_node = -{ - LDP_PSEUDOWIRE_NODE, - "%s(config-l2vpn-pw)# ", - 1, +struct cmd_node ldp_pseudowire_node = { + .node = LDP_PSEUDOWIRE_NODE, + .prompt = "%s(config-l2vpn-pw)# ", + .vtysh = 1, }; int |