*: remove VTYNL, part 4 of 6

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

5 files changed, 23 insertions, 33 deletions

diff --git a/zebra/debug.c b/zebra/debug.c
index 50c1f4dcb..5abd11142 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -48,20 +48,17 @@ DEFUN (show_debugging_zebra,
     {
       if (IS_ZEBRA_DEBUG_SEND && IS_ZEBRA_DEBUG_RECV)
 	{
-	  vty_out (vty, "  Zebra packet%s debugging is on%s",
-		   IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		   VTYNL);
+	  vty_out (vty, "  Zebra packet%s debugging is on\n",
+		   IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	}
       else
 	{
 	  if (IS_ZEBRA_DEBUG_SEND)
-	    vty_out (vty, "  Zebra packet send%s debugging is on%s",
-		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		     VTYNL);
+	    vty_out (vty, "  Zebra packet send%s debugging is on\n",
+		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	  else
-	    vty_out (vty, "  Zebra packet receive%s debugging is on%s",
-		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		     VTYNL);
+	    vty_out (vty, "  Zebra packet receive%s debugging is on\n",
+		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	}
     }
 
@@ -360,21 +357,18 @@ config_write_debug (struct vty *vty)
     {
       if (IS_ZEBRA_DEBUG_SEND && IS_ZEBRA_DEBUG_RECV)
 	{
-	  vty_out (vty, "debug zebra packet%s%s",
-		   IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		   VTYNL);
+	  vty_out (vty, "debug zebra packet%s\n",
+		   IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	  write++;
 	}
       else
 	{
 	  if (IS_ZEBRA_DEBUG_SEND)
-	    vty_out (vty, "debug zebra packet send%s%s",
-		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		     VTYNL);
+	    vty_out (vty, "debug zebra packet send%s\n",
+		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	  else
-	    vty_out (vty, "debug zebra packet recv%s%s",
-		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "",
-		     VTYNL);
+	    vty_out (vty, "debug zebra packet recv%s\n",
+		     IS_ZEBRA_DEBUG_DETAIL ? " detail" : "");
 	  write++;
 	}
     }
diff --git a/zebra/interface.c b/zebra/interface.c
index 171dcf69c..d7b2ebfe4 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1458,8 +1458,7 @@ DEFUN (show_interface_desc_vrf_all,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     if (!list_isempty (vrf->iflist))
       {
-        vty_out (vty, "\n\tVRF %u%s\n", vrf->vrf_id,
-		 VTYNL);
+        vty_out (vty, "\n\tVRF %u\n\n", vrf->vrf_id);
         if_show_description (vty, vrf->vrf_id);
       }
 
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index a6d022dd5..d04aff2d3 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1451,8 +1451,8 @@ zfpm_show_stats (struct vty *vty)
   zfpm_stats_t total_stats;
   time_t elapsed;
 
-  vty_out (vty, "\n%-40s %10s     Last %2d secs%s\n", "Counter",
-	   "Total", ZFPM_STATS_IVL_SECS, VTYNL);
+  vty_out (vty, "\n%-40s %10s     Last %2d secs\n\n", "Counter",
+	   "Total", ZFPM_STATS_IVL_SECS);
 
   /*
    * Compute the total stats up to this instant.
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 7b0d7bd78..78ca4d5f6 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -1009,20 +1009,18 @@ print_rnh (struct route_node *rn, struct vty *vty)
   char buf[BUFSIZ];
 
   rnh = rn->info;
-  vty_out(vty, "%s%s%s", inet_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ),
-	  CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "",
-	  VTYNL);
+  vty_out(vty, "%s%s\n", inet_ntop(rn->p.family, &rn->p.u.prefix, buf, BUFSIZ),
+	  CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "");
   if (rnh->state)
     {
-      vty_out(vty, " resolved via %s%s",
-	      zebra_route_string(rnh->state->type), VTYNL);
+      vty_out(vty, " resolved via %s\n",
+	      zebra_route_string(rnh->state->type));
       for (nexthop = rnh->state->nexthop; nexthop; nexthop = nexthop->next)
 	print_nh(nexthop, vty);
     }
   else
-    vty_out(vty, " unresolved%s%s",
-	    CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "",
-	    VTYNL);
+    vty_out(vty, " unresolved%s\n",
+	    CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED) ? "(Connected)" : "");
 
   vty_out(vty, " Client list:");
   for (ALL_LIST_ELEMENTS_RO(rnh->client_list, node, client))
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 6e4c1b185..6aaf7c86f 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -656,9 +656,8 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast)
                        : " using Unicast RIB";
         }
 
-      vty_out (vty, "Routing entry for %s%s%s",
-	       srcdest_rnode2str(rn, buf, sizeof(buf)), mcast_info,
-	       VTYNL);
+      vty_out (vty, "Routing entry for %s%s\n",
+	       srcdest_rnode2str(rn, buf, sizeof(buf)), mcast_info);
       vty_out (vty, "  Known via \"%s", zebra_route_string (re->type));
       if (re->instance)
         vty_out (vty, "[%d]", re->instance);