*: rebase vty_outln() -> master

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 96e0b63d6bcc32ae119847e4e506e01a6fc6f5f6..6e998085c109818b932cca7db74b1bc72b0771b5 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1009,7 +1009,7 @@ DEFPY (no_bgp_router_id,
     {
       if (! IPV4_ADDR_SAME (&bgp->router_id_static, &router_id))
        {
-         vty_outln (vty, "%% BGP router-id doesn't match%s");
+         vty_outln (vty, "%% BGP router-id doesn't match");
          return CMD_WARNING;
        }
     }

diff --git a/lib/routemap.c b/lib/routemap.c
index fa6f2691de20ccb3fac76fded78d3e2e24e94155..9eb28888ad6db9142194c558d5faa750763e022c 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -568,11 +568,11 @@ generic_match_delete (struct vty *vty, struct route_map_index *index,
       switch (ret)
         {
         case RMAP_RULE_MISSING:
-          vty_outln (vty, "%% [%s] Can't find rule.%s", frr_protonameinst);
+          vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
           break;
         case RMAP_COMPILE_ERROR:
-          vty_out (vty, "%% [%s] Argument form is unsupported or malformed.%s",
-                   frr_protonameinst, VTY_NEWLINE);
+          vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
+                     frr_protonameinst);
           break;
         }
       if (dep_name)
@@ -605,7 +605,7 @@ generic_set_add (struct vty *vty, struct route_map_index *index,
       switch (ret)
         {
         case RMAP_RULE_MISSING:
-          vty_outln (vty, "%% [%s] Can't find rule.%s", frr_protonameinst);
+          vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
           return CMD_WARNING;
         case RMAP_COMPILE_ERROR:
           vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
@@ -628,10 +628,10 @@ generic_set_delete (struct vty *vty, struct route_map_index *index,
       switch (ret)
         {
         case RMAP_RULE_MISSING:
-          vty_outln (vty, "%% [%s] Can't find rule.%s", frr_protonameinst);
+          vty_outln (vty, "%% [%s] Can't find rule.", frr_protonameinst);
           return CMD_WARNING;
         case RMAP_COMPILE_ERROR:
-          vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.%s",
+          vty_outln (vty, "%% [%s] Argument form is unsupported or malformed.",
                      frr_protonameinst);
           return CMD_WARNING;
         }

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 05a5961385ff23b626842a2450f17f931c0e1f2b..b136a752f26ad1d581b1702c427285f341d579b7 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3270,7 +3270,7 @@ show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, struct interface
       vty_outln (vty, "%s is %s", ifp->name,
                  ((is_up = if_is_operative(ifp)) ? "up" : "down"));
       vty_outln (vty, "  ifindex %u, MTU %u bytes, BW %u Mbit %s",
-                 ifp->ifindex, ifp->mtu, bandwidth, if_flag_dump(ifp->flags))
+                 ifp->ifindex, ifp->mtu, bandwidth, if_flag_dump(ifp->flags));
     }
 
   /* Is interface OSPF enabled? */
@@ -7025,8 +7025,7 @@ DEFUN (ip_ospf_area,
     if (OSPF_IF_PARAM_CONFIGURED(params, if_area))
       {
        vty_out (vty,
-                "Must remove previous area/address config before changing ospf area %s",
-                VTY_NEWLINE);
+                "Must remove previous area/address config before changing ospf area");
        return CMD_WARNING;
       }
     ospf_if_update_params ((ifp), (addr));

diff --git a/python/clidef.py b/python/clidef.py
index de3a764a0b0fc40f0e3dd608443864afe88f8763..1bf3c24aa2473e0ca1b1f8f181d051939b24b573 100644 (file)
--- a/python/clidef.py
+++ b/python/clidef.py
@@ -142,8 +142,8 @@ $argdecls
                        continue;
                _fail = 0;$argblocks
                if (_fail)
-                       vty_out (vty, "%% invalid input for %s: %s%s",
-                               argv[_i]->varname, argv[_i]->arg, VTY_NEWLINE);
+                       vty_outln (vty, "%% invalid input for %s: %s",
+                                  argv[_i]->varname, argv[_i]->arg);
                _failcnt += _fail;
        }
        if (_failcnt)

diff --git a/tests/lib/cli/test_cli.c b/tests/lib/cli/test_cli.c
index 2a68ba3826cc9c41803947eef513f342f7d34999..43366d49e2a9ca1e932c99ad49a6caefac577470 100644 (file)
--- a/tests/lib/cli/test_cli.c
+++ b/tests/lib/cli/test_cli.c
@@ -47,10 +47,10 @@ DEFPY(magic_test, magic_test_cmd,
        "1\n2\n3\n4\n5\n")
 {
   char buf[256];
-  vty_out(vty, "def: %s%s", self->string, VTY_NEWLINE);
-  vty_out(vty, "num: %ld%s", magic, VTY_NEWLINE);
-  vty_out(vty, "ipv4: %s%s", prefix2str(ipv4net, buf, sizeof(buf)), VTY_NEWLINE);
-  vty_out(vty, "ipv6: %s%s", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)), VTY_NEWLINE);
+  vty_outln(vty, "def: %s", self->string);
+  vty_outln(vty, "num: %ld", magic);
+  vty_outln(vty, "ipv4: %s", prefix2str(ipv4net, buf, sizeof(buf)));
+  vty_outln(vty, "ipv6: %s", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)));
   return CMD_SUCCESS;
 }