From: anlan_cs Date: Sun, 27 Feb 2022 01:38:29 +0000 (+0800) Subject: *: Add necessary new line for output of vty_out() X-Git-Tag: docker/8.2.0~11^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F10671%2Fhead;p=mirror%2Ffrr.git *: Add necessary new line for output of vty_out() Signed-off-by: anlan_cs (cherry picked from commit 4d4c404bf6f82ec7df67baff072e4f237c47180e) --- diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index f377c8352b..0209cb32ed 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -3859,19 +3859,19 @@ DEFUN (bgp_evpn_advertise_type5, if (!(afi == AFI_IP || afi == AFI_IP6)) { vty_out(vty, - "%%only ipv4 or ipv6 address families are supported"); + "%%only ipv4 or ipv6 address families are supported\n"); return CMD_WARNING; } if (safi != SAFI_UNICAST) { vty_out(vty, - "%%only ipv4 unicast or ipv6 unicast are supported"); + "%%only ipv4 unicast or ipv6 unicast are supported\n"); return CMD_WARNING; } if ((oly != OVERLAY_INDEX_TYPE_NONE) && (oly != OVERLAY_INDEX_GATEWAY_IP)) { - vty_out(vty, "%%Unknown overlay-index type specified"); + vty_out(vty, "%%Unknown overlay-index type specified\n"); return CMD_WARNING; } @@ -4050,13 +4050,13 @@ DEFUN (no_bgp_evpn_advertise_type5, if (!(afi == AFI_IP || afi == AFI_IP6)) { vty_out(vty, - "%%only ipv4 or ipv6 address families are supported"); + "%%only ipv4 or ipv6 address families are supported\n"); return CMD_WARNING; } if (safi != SAFI_UNICAST) { vty_out(vty, - "%%only ipv4 unicast or ipv6 unicast are supported"); + "%%only ipv4 unicast or ipv6 unicast are supported\n"); return CMD_WARNING; } diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index e5027359e7..f1ee1c9ad7 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -1262,7 +1262,7 @@ DEFPY (show_rpki_prefix, if (pfx_table_validate_r(rtr_config->pfx_table, &matches, &match_count, asn, &addr, prefix->prefixlen, &result) != PFX_SUCCESS) { - vty_out(vty, "Prefix lookup failed"); + vty_out(vty, "Prefix lookup failed\n"); return CMD_WARNING; } diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 95c06bd21e..4df2abef85 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -8568,7 +8568,7 @@ DEFPY (af_sid_vpn_export, if (!yes) { /* implement me */ - vty_out(vty, "It's not implemented"); + vty_out(vty, "It's not implemented\n"); return CMD_WARNING_CONFIG_FAILED; } diff --git a/lib/command.c b/lib/command.c index 9cf93ea192..3718c14594 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2223,9 +2223,9 @@ DEFUN (banner_motd_file, int cmd = cmd_banner_motd_file(filename); if (cmd == CMD_ERR_NO_FILE) - vty_out(vty, "%s does not exist", filename); + vty_out(vty, "%s does not exist\n", filename); else if (cmd == CMD_WARNING_CONFIG_FAILED) - vty_out(vty, "%s must be in %s", filename, SYSCONFDIR); + vty_out(vty, "%s must be in %s\n", filename, SYSCONFDIR); return cmd; } diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index a5bb6ae46b..1adf42dce8 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -9682,7 +9682,7 @@ DEFUN (ospf_max_metric_router_lsa_startup, unsigned int seconds; if (argc < 4) { - vty_out(vty, "%% Must supply stub-router period"); + vty_out(vty, "%% Must supply stub-router period\n"); return CMD_WARNING_CONFIG_FAILED; } @@ -9738,7 +9738,7 @@ DEFUN (ospf_max_metric_router_lsa_shutdown, unsigned int seconds; if (argc < 4) { - vty_out(vty, "%% Must supply stub-router shutdown period"); + vty_out(vty, "%% Must supply stub-router shutdown period\n"); return CMD_WARNING_CONFIG_FAILED; } diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c index 21c1409e91..b5946bd40d 100644 --- a/pbrd/pbr_vty.c +++ b/pbrd/pbr_vty.c @@ -358,7 +358,7 @@ DEFPY(pbr_map_match_mark, pbr_map_match_mark_cmd, struct pbr_map_sequence *pbrms = VTY_GET_CONTEXT(pbr_map_sequence); #ifndef GNU_LINUX - vty_out(vty, "pbr marks are not supported on this platform"); + vty_out(vty, "pbr marks are not supported on this platform\n"); return CMD_WARNING_CONFIG_FAILED; #endif diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c index 0a323f744e..5bf5f8af93 100644 --- a/sharpd/sharp_vty.c +++ b/sharpd/sharp_vty.c @@ -532,7 +532,7 @@ DEFPY(vrf_label, vrf_label_cmd, vrf = vrf_lookup_by_name(vrf_name); if (!vrf) { - vty_out(vty, "Unable to find vrf you silly head"); + vty_out(vty, "Unable to find vrf you silly head\n"); return CMD_WARNING_CONFIG_FAILED; } diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index f35c9f65fb..0a3d676a92 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -3422,7 +3422,7 @@ DEFUN (show_evpn_mac_vni_mac, vni = strtoul(argv[4]->arg, NULL, 10); if (!prefix_str2mac(argv[6]->arg, &mac)) { - vty_out(vty, "%% Malformed MAC address"); + vty_out(vty, "%% Malformed MAC address\n"); return CMD_WARNING; } zvrf = zebra_vrf_get_evpn();