From 7111c1a0cd00440fc5aa188eedbabde2a706bff0 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Wed, 5 Jul 2017 14:30:36 -0400 Subject: [PATCH] *: fix excess docstring Signed-off-by: Quentin Young --- babeld/babeld.c | 3 +- bgpd/bgp_route.c | 1 - bgpd/bgp_vty.c | 19 +++++-------- bgpd/rfapi/bgp_rfapi_cfg.c | 8 ++---- bgpd/rfapi/rfapi_vty.c | 16 ++++------- isisd/isis_vty.c | 15 +++------- lib/plist.c | 4 +-- ospf6d/ospf6_interface.c | 4 +-- ospf6d/ospf6_top.c | 2 -- ospfd/ospf_vty.c | 18 ++++-------- pimd/pim_cmd.c | 3 -- ripd/rip_interface.c | 58 ++++++-------------------------------- vtysh/vtysh.c | 8 ++---- zebra/zebra_vty.c | 45 ++++++++++------------------- 14 files changed, 53 insertions(+), 151 deletions(-) diff --git a/babeld/babeld.c b/babeld/babeld.c index b44b25ab4e..e17e00ca56 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -617,8 +617,7 @@ DEFUN (no_router_babel, "no router babel", NO_STR "Disable a routing process\n" - "Remove Babel instance command\n" - "No attributes\n") + "Remove Babel instance command\n") { if(babel_routing_process) babel_clean_routing_process(); diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 404360a3af..5a711c1e75 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -9436,7 +9436,6 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts, "Address Family modifier\n" "Address Family modifier\n" "Address Family modifier\n" - "Address Family modifier\n" "Detailed information on TCP and BGP neighbor connections\n" "Neighbor to display information about\n" "Neighbor to display information about\n" diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 6e998085c1..5b5f4096c0 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -1376,7 +1376,6 @@ DEFUN (bgp_update_delay_establish_wait, "update-delay (0-3600) (1-3600)", "Force initial delay for best-path and updates\n" "Seconds\n" - "Wait for peers to be established\n" "Seconds\n") { int idx_number = 1; @@ -1391,7 +1390,7 @@ DEFUN (no_bgp_update_delay, NO_STR "Force initial delay for best-path and updates\n" "Seconds\n" - "Wait for peers to be established\n") + "Seconds\n") { return bgp_update_delay_deconfig_vty(vty); } @@ -6240,11 +6239,10 @@ DEFUN_NOSH (address_family_vpnv6, DEFUN_NOSH (address_family_evpn, address_family_evpn_cmd, - "address-family ", + "address-family l2vpn evpn", "Enter Address Family command mode\n" - "EVPN Address family\n" - "Layer2 VPN Address family\n" - "Ethernet Virtual Private Network Subsequent Address Family\n") + "Address Family\n" + "Address Family modifier\n") { vty->node = BGP_EVPN_NODE; return CMD_SUCCESS; @@ -9620,8 +9618,7 @@ DEFUN (show_bgp_updgrps_afi_adj, "Detailed info about dynamic update groups\n" "Advertisement queue\n" "Announced routes\n" - "Packet queue\n" - "Specific subgroup info wanted for\n") + "Packet queue\n") { int idx_afi = 2; int idx_safi = 3; @@ -9726,8 +9723,7 @@ DEFUN (show_bgp_updgrps_afi_adj_s, "Specific subgroup to display info for\n" "Advertisement queue\n" "Announced routes\n" - "Packet queue\n" - "Specific subgroup info wanted for\n") + "Packet queue\n") { int idx_afi = 2; int idx_safi = 3; @@ -12180,8 +12176,7 @@ DEFUN (ip_lcommunity_list_standard, LCOMMUNITY_LIST_STR "Large Community list number (standard)\n" "Specify large community to reject\n" - "Specify large community to accept\n" - LCOMMUNITY_VAL_STR) + "Specify large community to accept\n") { return lcommunity_list_set_vty (vty, argc, argv, LARGE_COMMUNITY_LIST_STANDARD, 0); } diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 5cd8528ea9..14cce2d606 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -1313,9 +1313,9 @@ DEFUN (vnc_nve_group_redist_bgpdirect_no_prefixlist, NO_STR "Redistribute from other protocol\n" "Redistribute from BGP directly\n" - "Disable redistribute filter\n" "IPv4 routes\n" - "IPv6 routes\n" "Prefix-list for filtering redistributed routes\n") + "IPv6 routes\n" + "Prefix-list for filtering redistributed routes\n") { VTY_DECLVAR_CONTEXT(bgp, bgp); VTY_DECLVAR_CONTEXT_SUB(rfapi_nve_group_cfg, rfg) @@ -1412,7 +1412,6 @@ DEFUN (vnc_nve_group_redist_bgpdirect_no_routemap, NO_STR "Redistribute from other protocols\n" "Redistribute from BGP directly\n" - "Disable redistribute filter\n" "Route-map for filtering redistributed routes\n") { VTY_DECLVAR_CONTEXT(bgp, bgp); @@ -2076,7 +2075,6 @@ DEFUN (vnc_nve_export_prefixlist, "Export to other protocols\n" "Export to BGP\n" "Export to Zebra (experimental)\n" - "Filters, used in 'registering-nve' export mode\n" "IPv4 prefixes\n" "IPv6 prefixes\n" "Prefix-list for filtering exported routes\n" "Prefix list name\n") @@ -2178,7 +2176,6 @@ DEFUN (vnc_nve_export_routemap, "Export to other protocols\n" "Export to BGP\n" "Export to Zebra (experimental)\n" - "Filters, used in 'registering-nve' export mode\n" "Route-map for filtering exported routes\n" "Route map name\n") { VTY_DECLVAR_CONTEXT(bgp, bgp); @@ -3918,7 +3915,6 @@ DEFUN (vnc_l2_group_no_labels, vnc_l2_group_no_labels_cmd, "no labels LABELLIST...", NO_STR - "Remove label values associated with L2 group\n" "Specify label values associated with L2 group\n" "Space separated list of label values <0-1048575>\n") { diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 2062164890..791082bcbe 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -2672,8 +2672,7 @@ DEFUN (add_vnc_prefix_cost_life, "Administrative cost [default: 255]\n" "Administrative cost\n" "Registration lifetime [default: infinite]\n" - "Lifetime value in seconds\n" - "[local-next-hop (A.B.C.D|X:X::X:X)] [local-cost <0-255>]\n") + "Lifetime value in seconds\n") { /* pfx vn un cost life */ return register_add (vty, argv[3], argv[5], argv[7], argv[9], argv[11], @@ -2698,8 +2697,7 @@ DEFUN (add_vnc_prefix_life_cost, "Registration lifetime [default: infinite]\n" "Lifetime value in seconds\n" "Administrative cost [default: 255]\n" - "Administrative cost\n" - "[local-next-hop (A.B.C.D|X:X::X:X)] [local-cost <0-255>]\n") + "Administrative cost\n") { /* pfx vn un cost life */ return register_add (vty, argv[3], argv[5], argv[7], argv[11], argv[9], @@ -2722,8 +2720,7 @@ DEFUN (add_vnc_prefix_cost, "UN IPv4 interface address\n" "UN IPv6 interface address\n" "Administrative cost [default: 255]\n" - "Administrative cost\n" - "[local-next-hop (A.B.C.D|X:X::X:X)] [local-cost <0-255>]\n") + "Administrative cost\n") { /* pfx vn un cost life */ return register_add (vty, argv[3], argv[5], argv[7], argv[9], NULL, @@ -2746,8 +2743,7 @@ DEFUN (add_vnc_prefix_life, "UN IPv4 interface address\n" "UN IPv6 interface address\n" "Registration lifetime [default: infinite]\n" - "Lifetime value in seconds\n" - "[local-next-hop (A.B.C.D|X:X::X:X)] [local-cost <0-255>]\n") + "Lifetime value in seconds\n") { /* pfx vn un cost life */ return register_add (vty, argv[3], argv[5], argv[7], NULL, argv[9], @@ -2768,8 +2764,7 @@ DEFUN (add_vnc_prefix, "VN IPv6 interface address\n" "UN address of NVE\n" "UN IPv4 interface address\n" - "UN IPv6 interface address\n" - "[local-next-hop (A.B.C.D|X:X::X:X)] [local-cost <0-255>]\n") + "UN IPv6 interface address\n") { /* pfx vn un cost life */ return register_add (vty, argv[3], argv[5], argv[7], NULL, NULL, @@ -4064,7 +4059,6 @@ DEFUN (clear_vnc_mac_vn_un, "VNI keyword\n" "Any virtual network identifier\n" "Virtual network identifier\n" - "Virtual network identifier\n" "VN address of NVE\n" "All VN addresses\n" "VN IPv4 interface address\n" diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c index b603ab5dc9..f0e2831bff 100644 --- a/isisd/isis_vty.c +++ b/isisd/isis_vty.c @@ -673,7 +673,6 @@ DEFUN (isis_hello_interval, "isis hello-interval (1-600)", "IS-IS commands\n" "Set Hello interval\n" - "Hello interval value\n" "Holdtime 1 seconds, interval depends on multiplier\n") { int idx_number = 2; @@ -721,7 +720,6 @@ DEFUN (isis_hello_interval_l1, "isis hello-interval (1-600) level-1", "IS-IS commands\n" "Set Hello interval\n" - "Hello interval value\n" "Holdtime 1 second, interval depends on multiplier\n" "Specify hello-interval for level-1 IIHs\n") { @@ -769,7 +767,6 @@ DEFUN (isis_hello_interval_l2, "isis hello-interval (1-600) level-2", "IS-IS commands\n" "Set Hello interval\n" - "Hello interval value\n" "Holdtime 1 second, interval depends on multiplier\n" "Specify hello-interval for level-2 IIHs\n") { @@ -958,8 +955,7 @@ DEFUN (isis_hello_padding, "isis hello padding", "IS-IS commands\n" "Add padding to IS-IS hello packets\n" - "Pad hello packets\n" - "\n") + "Pad hello packets\n") { struct isis_circuit *circuit = isis_circuit_lookup (vty); if (!circuit) @@ -976,8 +972,7 @@ DEFUN (no_isis_hello_padding, NO_STR "IS-IS commands\n" "Add padding to IS-IS hello packets\n" - "Pad hello packets\n" - "\n") + "Pad hello packets\n") { struct isis_circuit *circuit = isis_circuit_lookup (vty); if (!circuit) @@ -1431,8 +1426,7 @@ DEFUN (no_metric_style, DEFUN (set_overload_bit, set_overload_bit_cmd, "set-overload-bit", - "Set overload bit to avoid any transit traffic\n" - "Set overload bit\n") + "Set overload bit to avoid any transit traffic\n") { VTY_DECLVAR_CONTEXT (isis_area, area); @@ -1455,8 +1449,7 @@ DEFUN (no_set_overload_bit, DEFUN (set_attached_bit, set_attached_bit_cmd, "set-attached-bit", - "Set attached bit to identify as L1/L2 router for inter-area traffic\n" - "Set attached bit\n") + "Set attached bit to identify as L1/L2 router for inter-area traffic\n") { VTY_DECLVAR_CONTEXT (isis_area, area); diff --git a/lib/plist.c b/lib/plist.c index 172f2b39db..339540a2b5 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1736,9 +1736,7 @@ DEFPY (show_ipv6_prefix_list, PREFIX_LIST_STR "Name of a prefix list\n" "sequence number of an entry\n" - "Sequence number\n" - "Lookup longer prefix\n" - "First matched prefix\n") + "Sequence number\n") { enum display_type dtype = normal_display; if (dseq) diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index e50de6fab2..e91c249845 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1729,9 +1729,7 @@ DEFUN (no_ipv6_ospf6_network, NO_STR IP6_STR OSPF6_STR - "Network type\n" - "Default to whatever interface type system specifies" - ) + "Set default network type\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct ospf6_interface *oi; diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 2f157d98a0..268b7a60a2 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -697,7 +697,6 @@ DEFUN (ospf6_stub_router_admin, ospf6_stub_router_admin_cmd, "stub-router administrative", "Make router a stub router\n" - "Advertise inability to be a transit router\n" "Administratively applied, for an indefinite period\n") { struct listnode *node; @@ -722,7 +721,6 @@ DEFUN (no_ospf6_stub_router_admin, "no stub-router administrative", NO_STR "Make router a stub router\n" - "Advertise ability to be a transit router\n" "Administratively applied, for an indefinite period\n") { struct listnode *node; diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 799214c9c5..bc98da45ee 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7095,8 +7095,7 @@ DEFUN (ospf_redistribute_source, "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { @@ -7147,8 +7146,7 @@ DEFUN (no_ospf_redistribute_source, "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { @@ -7179,8 +7177,7 @@ DEFUN (ospf_redistribute_instance_source, "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { @@ -7251,8 +7248,7 @@ DEFUN (no_ospf_redistribute_instance_source, "Metric for redistributed routes\n" "OSPF default metric\n" "OSPF exterior metric type for redistributed routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { @@ -7345,8 +7341,7 @@ DEFUN (ospf_default_information_originate, "OSPF default metric\n" "OSPF metric\n" "OSPF metric type for default routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { @@ -7392,8 +7387,7 @@ DEFUN (no_ospf_default_information_originate, "OSPF default metric\n" "OSPF metric\n" "OSPF metric type for default routes\n" - "Set OSPF External Type 1 metrics\n" - "Set OSPF External Type 2 metrics\n" + "Set OSPF External Type 1/2 metrics\n" "Route map reference\n" "Pointer to route-map entries\n") { diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 0051298e4a..b0afc7828a 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -4256,7 +4256,6 @@ DEFUN_HIDDEN (no_ip_multicast_routing, "no ip multicast-routing", NO_STR IP_STR - "Global IP configuration subcommands\n" "Enable IP multicast forwarding\n") { vty_outln (vty, @@ -5732,7 +5731,6 @@ DEFUN (debug_ssmpingd, debug_ssmpingd_cmd, "debug ssmpingd", DEBUG_STR - DEBUG_PIM_STR DEBUG_SSMPINGD_STR) { PIM_DO_DEBUG_SSMPINGD; @@ -5744,7 +5742,6 @@ DEFUN (no_debug_ssmpingd, "no debug ssmpingd", NO_STR DEBUG_STR - DEBUG_PIM_STR DEBUG_SSMPINGD_STR) { PIM_DONT_DEBUG_SSMPINGD; diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 425b01c247..4ce1b9b655 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -1327,8 +1327,7 @@ DEFUN (ip_rip_receive_version, "Routing Information Protocol\n" "Advertisement reception\n" "Version control\n" - "RIP version 1\n" - "RIP version 2\n" + "RIP version\n" "None\n") { VTY_DECLVAR_CONTEXT(interface, ifp); @@ -1357,31 +1356,13 @@ DEFUN (ip_rip_receive_version, DEFUN (ip_rip_receive_version_1, ip_rip_receive_version_1_cmd, - "ip rip receive version (1-1) (2-2)", + "ip rip receive version <1 2|2 1>", IP_STR "Routing Information Protocol\n" "Advertisement reception\n" "Version control\n" "RIP version 1\n" - "RIP version 2\n") -{ - VTY_DECLVAR_CONTEXT(interface, ifp); - struct rip_interface *ri; - - ri = ifp->info; - - /* Version 1 and 2. */ - ri->ri_receive = RI_RIP_VERSION_1_AND_2; - return CMD_SUCCESS; -} - -DEFUN (ip_rip_receive_version_2, - ip_rip_receive_version_2_cmd, - "ip rip receive version (2-2) (1-1)", - IP_STR - "Routing Information Protocol\n" - "Advertisement reception\n" - "Version control\n" + "RIP version 2\n" "RIP version 2\n" "RIP version 1\n") { @@ -1403,8 +1384,7 @@ DEFUN (no_ip_rip_receive_version, "Routing Information Protocol\n" "Advertisement reception\n" "Version control\n" - "Version 1\n" - "Version 2\n") + "RIP version\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct rip_interface *ri; @@ -1423,8 +1403,7 @@ DEFUN (ip_rip_send_version, "Routing Information Protocol\n" "Advertisement transmission\n" "Version control\n" - "RIP version 1\n" - "RIP version 2\n") + "RIP version\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_type = 4; @@ -1448,31 +1427,13 @@ DEFUN (ip_rip_send_version, DEFUN (ip_rip_send_version_1, ip_rip_send_version_1_cmd, - "ip rip send version (1-1) (2-2)", + "ip rip send version <1 2|2 1>", IP_STR "Routing Information Protocol\n" "Advertisement transmission\n" "Version control\n" "RIP version 1\n" - "RIP version 2\n") -{ - VTY_DECLVAR_CONTEXT(interface, ifp); - struct rip_interface *ri; - - ri = ifp->info; - - /* Version 1 and 2. */ - ri->ri_send = RI_RIP_VERSION_1_AND_2; - return CMD_SUCCESS; -} - -DEFUN (ip_rip_send_version_2, - ip_rip_send_version_2_cmd, - "ip rip send version (2-2) (1-1)", - IP_STR - "Routing Information Protocol\n" - "Advertisement transmission\n" - "Version control\n" + "RIP version 2\n" "RIP version 2\n" "RIP version 1\n") { @@ -1494,8 +1455,7 @@ DEFUN (no_ip_rip_send_version, "Routing Information Protocol\n" "Advertisement transmission\n" "Version control\n" - "Version 1\n" - "Version 2\n") + "RIP version\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct rip_interface *ri; @@ -2034,12 +1994,10 @@ rip_if_init (void) install_element (INTERFACE_NODE, &ip_rip_send_version_cmd); install_element (INTERFACE_NODE, &ip_rip_send_version_1_cmd); - install_element (INTERFACE_NODE, &ip_rip_send_version_2_cmd); install_element (INTERFACE_NODE, &no_ip_rip_send_version_cmd); install_element (INTERFACE_NODE, &ip_rip_receive_version_cmd); install_element (INTERFACE_NODE, &ip_rip_receive_version_1_cmd); - install_element (INTERFACE_NODE, &ip_rip_receive_version_2_cmd); install_element (INTERFACE_NODE, &no_ip_rip_receive_version_cmd); install_element (INTERFACE_NODE, &ip_rip_v2_broadcast_cmd); diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 0e04f4bf8e..fe402f7098 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1271,9 +1271,8 @@ DEFUNSH (VTYSH_BGPD, address_family_evpn_cmd, "address-family ", "Enter Address Family command mode\n" - "EVPN Address family\n" - "Layer2 VPN Address family\n" - "Ethernet Virtual Private Network Subsequent Address Family\n") + "Address Family\n" + "Address Family modifier\n") { vty->node = BGP_EVPN_NODE; return CMD_SUCCESS; @@ -2445,10 +2444,9 @@ DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_ALL, vtysh_config_password, vtysh_password_cmd, - "password (8-8) WORD", + "password [(8-8)] WORD", "Assign the terminal connection password\n" "Specifies a HIDDEN password will follow\n" - "dummy string \n" "The HIDDEN line password string\n") { return CMD_SUCCESS; diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index c861efbddf..06412e1b3f 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -433,8 +433,7 @@ DEFUN (ip_route_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4_prefixlen = 2; int idx_reject_blackhole = 3; @@ -466,8 +465,7 @@ DEFUN (ip_route_mask, "Set tag for this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4 = 2; int idx_ipv4_2 = 3; @@ -497,8 +495,7 @@ DEFUN (ip_route_mask_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4 = 2; int idx_ipv4_2 = 3; @@ -530,8 +527,7 @@ DEFUN (no_ip_route, "Tag of this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4_prefixlen = 3; int idx_ipv4_ifname_null = 4; @@ -561,8 +557,7 @@ DEFUN (no_ip_route_flags, "Tag of this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4_prefixlen = 3; int idx_curr = 5; @@ -591,8 +586,7 @@ DEFUN (no_ip_route_mask, "Tag of this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4 = 3; int idx_ipv4_2 = 4; @@ -624,8 +618,7 @@ DEFUN (no_ip_route_mask_flags, "Tag of this route\n" "Tag value\n" "Distance value for this route\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv4 = 3; int idx_ipv4_2 = 4; @@ -2171,8 +2164,7 @@ DEFUN (ipv6_route, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 2; int idx_ipv6_ifname; @@ -2218,8 +2210,7 @@ DEFUN (ipv6_route_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 2; int idx_ipv6_ifname; @@ -2267,8 +2258,7 @@ DEFUN (ipv6_route_ifname, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 2; int idx_ipv6 = 3; @@ -2318,8 +2308,7 @@ DEFUN (ipv6_route_ifname_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 2; int idx_ipv6; @@ -2372,8 +2361,7 @@ DEFUN (no_ipv6_route, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 3; int idx_ipv6_ifname; @@ -2420,8 +2408,7 @@ DEFUN (no_ipv6_route_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 3; int idx_ipv6_ifname; @@ -2470,8 +2457,7 @@ DEFUN (no_ipv6_route_ifname, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 3; int idx_ipv6; @@ -2522,8 +2508,7 @@ DEFUN (no_ipv6_route_ifname_flags, "Set tag for this route\n" "Tag value\n" "Distance value for this prefix\n" - VRF_CMD_HELP_STR - MPLS_LABEL_HELPSTR) + VRF_CMD_HELP_STR) { int idx_ipv6_prefixlen = 3; int idx_ipv6; -- 2.39.5