From efd7904eabd3a79e14301b1a2005e36347293d4a Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Fri, 20 Oct 2017 22:16:57 -0200 Subject: [PATCH] *: add missing \n in some help strings Signed-off-by: Renato Westphal --- bgpd/bgp_vty.c | 6 ++-- bgpd/rfp-example/librfp/rfp_example.c | 2 +- eigrpd/eigrp_vty.c | 5 ++- isisd/isisd.c | 2 +- lib/command.c | 2 +- lib/keychain.c | 8 ++--- nhrpd/nhrp_vty.c | 4 +-- ospfd/ospf_ri.c | 2 +- ospfd/ospf_vty.c | 52 ++++++++++++++++----------- zebra/debug.c | 2 +- zebra/interface.c | 2 +- zebra/zebra_pw.c | 2 +- zebra/zserv.c | 8 ++--- 13 files changed, 54 insertions(+), 43 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 02a194050c..749c9d25d4 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -3794,7 +3794,7 @@ DEFUN (neighbor_remove_private_as_all, NEIGHBOR_STR NEIGHBOR_ADDR_STR2 "Remove private ASNs in outbound updates\n" - "Apply to all AS numbers") + "Apply to all AS numbers\n") { int idx_peer = 1; return peer_af_flag_set_vty(vty, argv[idx_peer]->arg, bgp_node_afi(vty), @@ -5733,7 +5733,7 @@ DEFUN (neighbor_maximum_prefix_restart, "Maximum number of prefix accept from this peer\n" "maximum no. of prefix limit\n" "Restart bgp connection after limit is exceeded\n" - "Restart interval in minutes") + "Restart interval in minutes\n") { int idx_peer = 1; int idx_number = 3; @@ -5751,7 +5751,7 @@ ALIAS_HIDDEN( "Maximum number of prefix accept from this peer\n" "maximum no. of prefix limit\n" "Restart bgp connection after limit is exceeded\n" - "Restart interval in minutes") + "Restart interval in minutes\n") DEFUN (neighbor_maximum_prefix_threshold_restart, neighbor_maximum_prefix_threshold_restart_cmd, diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index fb112a8865..cde2d7b352 100644 --- a/bgpd/rfp-example/librfp/rfp_example.c +++ b/bgpd/rfp-example/librfp/rfp_example.c @@ -42,7 +42,7 @@ DEFUN (rfp_example_config_value, "rfp example-config-value VALUE", RFP_SHOW_STR "Example value to be configured\n" - "Value to display") + "Value to display\n") { uint32_t value = 0; struct rfp_instance_t *rfi = NULL; diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c index 34a07f5fe3..5fc7818166 100644 --- a/eigrpd/eigrp_vty.c +++ b/eigrpd/eigrp_vty.c @@ -870,11 +870,10 @@ DEFUN (no_eigrp_ip_summary_address, DEFUN (no_eigrp_if_ip_holdinterval, no_eigrp_if_ip_holdinterval_cmd, "no ip hold-time eigrp", - "No" + NO_STR "Interface Internet Protocol config commands\n" "Configures EIGRP hello interval\n" - "Enhanced Interior Gateway Routing Protocol (EIGRP)\n" - "Seconds before neighbor is considered down\n") + "Enhanced Interior Gateway Routing Protocol (EIGRP)\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct eigrp_interface *ei = ifp->info; diff --git a/isisd/isisd.c b/isisd/isisd.c index 5dd348089d..d4e5a4e29b 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -1509,7 +1509,7 @@ DEFUN_NOSH (router_isis, "router isis WORD", ROUTER_STR "ISO IS-IS\n" - "ISO Routing area tag") + "ISO Routing area tag\n") { int idx_word = 2; return isis_area_get(vty, argv[idx_word]->arg); diff --git a/lib/command.c b/lib/command.c index 97eba96c3a..2e91d84bf3 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1367,7 +1367,7 @@ DEFUN (config_quit, DEFUN (config_end, config_end_cmd, "end", - "End current mode and change to enable mode.") + "End current mode and change to enable mode.\n") { switch (vty->node) { case VIEW_NODE: diff --git a/lib/keychain.c b/lib/keychain.c index 23a2d72b17..bb2c173354 100644 --- a/lib/keychain.c +++ b/lib/keychain.c @@ -633,7 +633,7 @@ DEFUN (accept_lifetime_infinite_day_month, "Day of th month to start\n" "Month of the year to start\n" "Year to start\n" - "Never expires") + "Never expires\n") { int idx_hhmmss = 1; int idx_number = 2; @@ -654,7 +654,7 @@ DEFUN (accept_lifetime_infinite_month_day, "Month of the year to start\n" "Day of th month to start\n" "Year to start\n" - "Never expires") + "Never expires\n") { int idx_hhmmss = 1; int idx_month = 2; @@ -843,7 +843,7 @@ DEFUN (send_lifetime_infinite_day_month, "Day of th month to start\n" "Month of the year to start\n" "Year to start\n" - "Never expires") + "Never expires\n") { int idx_hhmmss = 1; int idx_number = 2; @@ -864,7 +864,7 @@ DEFUN (send_lifetime_infinite_month_day, "Month of the year to start\n" "Day of th month to start\n" "Year to start\n" - "Never expires") + "Never expires\n") { int idx_hhmmss = 1; int idx_month = 2; diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c index ab052ac04a..e0d0268e41 100644 --- a/nhrpd/nhrp_vty.c +++ b/nhrpd/nhrp_vty.c @@ -438,7 +438,7 @@ DEFUN(if_nhrp_mtu, if_nhrp_mtu_cmd, NHRP_STR "Configure NHRP advertised MTU\n" "MTU value\n" - "Advertise bound interface MTU similar to OpenNHRP") + "Advertise bound interface MTU similar to OpenNHRP\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct nhrp_interface *nifp = ifp->info; @@ -461,7 +461,7 @@ DEFUN(if_no_nhrp_mtu, if_no_nhrp_mtu_cmd, NHRP_STR "Configure NHRP advertised MTU\n" "MTU value\n" - "Advertise bound interface MTU similar to OpenNHRP") + "Advertise bound interface MTU similar to OpenNHRP\n") { VTY_DECLVAR_CONTEXT(interface, ifp); struct nhrp_interface *nifp = ifp->info; diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c index 69f6883186..ead6923435 100644 --- a/ospfd/ospf_ri.c +++ b/ospfd/ospf_ri.c @@ -1119,7 +1119,7 @@ DEFUN (router_info, OSPF_RI_STR "Enable the Router Information functionality with AS flooding scope\n" "Enable the Router Information functionality with Area flooding scope\n" - "OSPF area ID in IP format") + "OSPF area ID in IP format\n") { int idx_ipv4 = 2; char *area = (argc == 3) ? argv[idx_ipv4]->arg : NULL; diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index df3cd16c1c..f349979d18 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -6243,7 +6243,7 @@ DEFUN (ip_ospf_authentication, "IP Information\n" "OSPF interface commands\n" "Enable authentication on this interface\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_ipv4 = 3; @@ -6280,7 +6280,7 @@ DEFUN (no_ip_ospf_authentication_args, "Enable authentication on this interface\n" "Use null authentication\n" "Use message-digest authentication\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_encryption = 4; @@ -6360,7 +6360,7 @@ DEFUN (no_ip_ospf_authentication, "IP Information\n" "OSPF interface commands\n" "Enable authentication on this interface\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_ipv4 = 4; @@ -6437,7 +6437,7 @@ DEFUN (ip_ospf_authentication_key, "OSPF interface commands\n" "Authentication password (key)\n" "The OSPF password (key)\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -6649,7 +6649,9 @@ DEFUN_HIDDEN (no_ospf_message_digest_key, "OSPF interface commands\n" "Message digest authentication password (key)\n" "Key ID\n" - "Address of interface") + "Use MD5 algorithm\n" + "The OSPF password (key)\n" + "Address of interface\n") { return no_ip_ospf_message_digest_key(self, vty, argc, argv); } @@ -6712,9 +6714,11 @@ DEFUN (no_ip_ospf_cost, no_ip_ospf_cost_cmd, "no ip ospf cost [(1-65535)] [A.B.C.D]", NO_STR + "IP Information\n" "OSPF interface commands\n" "Interface cost\n" - "Address of interface") + "Cost\n" + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -6907,7 +6911,10 @@ DEFUN (no_ip_ospf_dead_interval, "OSPF interface commands\n" "Interval time after which a neighbor is declared down\n" "Seconds\n" - "Address of interface") + "Minimal 1s dead-interval with fast sub-second hellos\n" + "Hello multiplier factor\n" + "Number of Hellos to send each second\n" + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_ipv4 = argc - 1; @@ -6969,7 +6976,10 @@ DEFUN_HIDDEN (no_ospf_dead_interval, "OSPF interface commands\n" "Interval time after which a neighbor is declared down\n" "Seconds\n" - "Address of interface") + "Minimal 1s dead-interval with fast sub-second hellos\n" + "Hello multiplier factor\n" + "Number of Hellos to send each second\n" + "Address of interface\n") { return no_ip_ospf_dead_interval(self, vty, argc, argv); } @@ -7198,7 +7208,7 @@ DEFUN (ip_ospf_priority, "OSPF interface commands\n" "Router priority\n" "Priority\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -7246,7 +7256,7 @@ DEFUN_HIDDEN (ospf_priority, "OSPF interface commands\n" "Router priority\n" "Priority\n" - "Address of interface") + "Address of interface\n") { return ip_ospf_priority(self, vty, argc, argv); } @@ -7259,7 +7269,7 @@ DEFUN (no_ip_ospf_priority, "OSPF interface commands\n" "Router priority\n" // ignored "Priority\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -7311,7 +7321,7 @@ DEFUN_HIDDEN (no_ospf_priority, "OSPF interface commands\n" "Router priority\n" "Priority\n" - "Address of interface") + "Address of interface\n") { return no_ip_ospf_priority(self, vty, argc, argv); } @@ -7323,7 +7333,7 @@ DEFUN (ip_ospf_retransmit_interval, "OSPF interface commands\n" "Time between retransmitting lost link state advertisements\n" "Seconds\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -7358,7 +7368,7 @@ DEFUN_HIDDEN (ospf_retransmit_interval, "OSPF interface commands\n" "Time between retransmitting lost link state advertisements\n" "Seconds\n" - "Address of interface") + "Address of interface\n") { return ip_ospf_retransmit_interval(self, vty, argc, argv); } @@ -7422,7 +7432,7 @@ DEFUN (ip_ospf_transmit_delay, "OSPF interface commands\n" "Link state transmit delay\n" "Seconds\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -7457,7 +7467,7 @@ DEFUN_HIDDEN (ospf_transmit_delay, "OSPF interface commands\n" "Link state transmit delay\n" "Seconds\n" - "Address of interface") + "Address of interface\n") { return ip_ospf_transmit_delay(self, vty, argc, argv); } @@ -7469,7 +7479,8 @@ DEFUN (no_ip_ospf_transmit_delay, "IP Information\n" "OSPF interface commands\n" "Link state transmit delay\n" - "Address of interface") + "Seconds\n" + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx = 0; @@ -7509,7 +7520,7 @@ DEFUN_HIDDEN (no_ospf_transmit_delay, "OSPF interface commands\n" "Link state transmit delay\n" "Seconds\n" - "Address of interface") + "Address of interface\n") { return no_ip_ospf_transmit_delay(self, vty, argc, argv); } @@ -8203,7 +8214,7 @@ DEFUN (ip_ospf_mtu_ignore, "IP Information\n" "OSPF interface commands\n" "Disable MTU mismatch detection on this interface\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_ipv4 = 3; @@ -8239,10 +8250,11 @@ DEFUN (ip_ospf_mtu_ignore, DEFUN (no_ip_ospf_mtu_ignore, no_ip_ospf_mtu_ignore_addr_cmd, "no ip ospf mtu-ignore [A.B.C.D]", + NO_STR "IP Information\n" "OSPF interface commands\n" "Disable MTU mismatch detection on this interface\n" - "Address of interface") + "Address of interface\n") { VTY_DECLVAR_CONTEXT(interface, ifp); int idx_ipv4 = 4; diff --git a/zebra/debug.c b/zebra/debug.c index ac96051abd..1df547a023 100644 --- a/zebra/debug.c +++ b/zebra/debug.c @@ -138,7 +138,7 @@ DEFUN (debug_zebra_vxlan, DEFUN (debug_zebra_pw, debug_zebra_pw_cmd, "[no] debug zebra pseudowires", - "Negate a command or set its defaults\n" + NO_STR DEBUG_STR "Zebra configuration\n" "Debug option set for zebra pseudowires\n") diff --git a/zebra/interface.c b/zebra/interface.c index e912b2dcf8..dd1050ee7f 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -2539,7 +2539,7 @@ DEFUN (no_ip_address, NO_STR "Interface Internet Protocol config commands\n" "Set the IP address of an interface\n" - "IP Address (e.g. 10.0.0.1/8)") + "IP Address (e.g. 10.0.0.1/8)\n") { int idx_ipv4_prefixlen = 3; VTY_DECLVAR_CONTEXT(interface, ifp); diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index 0ca7e34b23..d3492fb41c 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -436,7 +436,7 @@ DEFUN (show_pseudowires, "show mpls pseudowires", SHOW_STR MPLS_STR - "Pseudowires") + "Pseudowires\n") { struct zebra_vrf *zvrf; struct zebra_pw *pw; diff --git a/zebra/zserv.c b/zebra/zserv.c index 6295de0c2e..15bfd37da8 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2800,7 +2800,7 @@ DEFUN (ip_forwarding, ip_forwarding_cmd, "ip forwarding", IP_STR - "Turn on IP forwarding") + "Turn on IP forwarding\n") { int ret; @@ -2821,7 +2821,7 @@ DEFUN (no_ip_forwarding, "no ip forwarding", NO_STR IP_STR - "Turn off IP forwarding") + "Turn off IP forwarding\n") { int ret; @@ -2967,7 +2967,7 @@ DEFUN (ipv6_forwarding, ipv6_forwarding_cmd, "ipv6 forwarding", IPV6_STR - "Turn on IPv6 forwarding") + "Turn on IPv6 forwarding\n") { int ret; @@ -2988,7 +2988,7 @@ DEFUN (no_ipv6_forwarding, "no ipv6 forwarding", NO_STR IPV6_STR - "Turn off IPv6 forwarding") + "Turn off IPv6 forwarding\n") { int ret; -- 2.39.5