*: remove VTYNL, part 2 of 6

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

5 files changed, 5 insertions, 7 deletions

diff --git a/lib/if.c b/lib/if.c
index d694067816..e6a957a958 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -745,8 +745,7 @@ DEFUN_NOSH (no_interface,
 
   if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE)) 
     {
-      vty_out (vty, "%% Only inactive interfaces can be deleted%s",
-	      VTYNL);
+      vty_out (vty, "%% Only inactive interfaces can be deleted\n");
       return CMD_WARNING;
     }
 
diff --git a/lib/plist.c b/lib/plist.c
index 3a9d26064d..0c04b6247e 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1861,7 +1861,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
 	  vty_out (vty, "\n");
 	  write++;
 	}
-      /* vty_out (vty, "!%s", VTYNL); */
+      /* vty_out (vty, "!\n"); */
     }
 
   for (plist = master->str.head; plist; plist = plist->next)
diff --git a/lib/smux.c b/lib/smux.c
index f8bf01e289..64b406bd67 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -1278,7 +1278,7 @@ smux_peer_oid (struct vty *vty, const char *oid_str, const char *passwd_str)
   ret = smux_str2oid (oid_str, oid, &oid_len);
   if (ret != 0)
     {
-      vty_out (vty, "object ID malformed%s", VTYNL);
+      vty_out (vty, "object ID malformed\n");
       return CMD_WARNING;
     }
 
diff --git a/lib/vrf.c b/lib/vrf.c
index 6af3ccc61b..7fe5d9a87d 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -507,8 +507,7 @@ DEFUN_NOSH (no_vrf,
 
   if (CHECK_FLAG (vrfp->status, VRF_ACTIVE))
     {
-      vty_out (vty, "%% Only inactive VRFs can be deleted%s",
-              VTYNL);
+      vty_out (vty, "%% Only inactive VRFs can be deleted\n");
       return CMD_WARNING;
     }
 
diff --git a/lib/vty.c b/lib/vty.c
index 0c7a5524c9..db0fbdd6d4 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -938,7 +938,7 @@ vty_complete_command (struct vty *vty)
       vty_redraw_line (vty);
       break;
     case CMD_ERR_NO_MATCH:
-      /* vty_out (vty, "%% There is no matched command.%s", VTYNL); */
+      /* vty_out (vty, "%% There is no matched command.\n"); */
       vty_prompt (vty);
       vty_redraw_line (vty);
       break;