*: ditch vty_outln(), part 2 of 2

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

4 files changed, 35 insertions, 35 deletions

diff --git a/zebra/interface.c b/zebra/interface.c
index e2def4a49..291a79274 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -984,27 +984,27 @@ nd_dump_vty (struct vty *vty, struct interface *ifp)
 	       zif->ra_sent, zif->ra_rcvd);
       interval = rtadv->MaxRtrAdvInterval;
       if (interval % 1000)
-        vty_outln (vty, "  ND router advertisements are sent every "
-			"%d milliseconds",interval);
+        vty_out (vty, "  ND router advertisements are sent every "
+			"%d milliseconds\n",interval);
       else
-        vty_outln (vty, "  ND router advertisements are sent every "
-			"%d seconds",interval / 1000);
+        vty_out (vty, "  ND router advertisements are sent every "
+			"%d seconds\n",interval / 1000);
       if (rtadv->AdvDefaultLifetime != -1)
 	vty_out (vty, "  ND router advertisements live for %d seconds\n",
 		 rtadv->AdvDefaultLifetime);
       else
 	vty_out (vty,
                    "  ND router advertisements lifetime tracks ra-interval\n");
-      vty_outln (vty, "  ND router advertisement default router preference is "
-			"%s",rtadv_pref_strs[rtadv->DefaultPreference]);
+      vty_out (vty, "  ND router advertisement default router preference is "
+			"%s\n",rtadv_pref_strs[rtadv->DefaultPreference]);
       if (rtadv->AdvManagedFlag)
 	vty_out (vty,"  Hosts use DHCP to obtain routable addresses.\n");
       else
 	vty_out (vty,"  Hosts use stateless autoconfig for addresses.\n");
       if (rtadv->AdvHomeAgentFlag)
       {
-      	vty_outln (vty,
-                         "  ND router advertisements with " "Home Agent flag bit set.");
+	vty_out (vty,
+                         "  ND router advertisements with Home Agent flag bit set.\n");
 	if (rtadv->HomeAgentLifetime != -1)
 	  vty_out (vty, "  Home Agent lifetime is %u seconds\n",
 	           rtadv->HomeAgentLifetime);
@@ -1175,13 +1175,13 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 
 #ifdef HAVE_PROC_NET_DEV
   /* Statistics print out using proc file system. */
-  vty_outln (vty, "    %lu input packets (%lu multicast), %lu bytes, "
-	   "%lu dropped",
+  vty_out (vty, "    %lu input packets (%lu multicast), %lu bytes, "
+	   "%lu dropped\n",
 	   ifp->stats.rx_packets, ifp->stats.rx_multicast,
 	   ifp->stats.rx_bytes, ifp->stats.rx_dropped);
 
-  vty_outln (vty, "    %lu input errors, %lu length, %lu overrun,"
-	   " %lu CRC, %lu frame",
+  vty_out (vty, "    %lu input errors, %lu length, %lu overrun,"
+	   " %lu CRC, %lu frame\n",
 	   ifp->stats.rx_errors, ifp->stats.rx_length_errors,
 	   ifp->stats.rx_over_errors, ifp->stats.rx_crc_errors,
 	   ifp->stats.rx_frame_errors);
@@ -1193,8 +1193,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 	   ifp->stats.tx_packets, ifp->stats.tx_bytes,
 	   ifp->stats.tx_dropped);
 
-  vty_outln (vty, "    %lu output errors, %lu aborted, %lu carrier,"
-	   " %lu fifo, %lu heartbeat",
+  vty_out (vty, "    %lu output errors, %lu aborted, %lu carrier,"
+	   " %lu fifo, %lu heartbeat\n",
 	   ifp->stats.tx_errors, ifp->stats.tx_aborted_errors,
 	   ifp->stats.tx_carrier_errors, ifp->stats.tx_fifo_errors,
 	   ifp->stats.tx_heartbeat_errors);
@@ -1206,8 +1206,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 #ifdef HAVE_NET_RT_IFLIST
 #if defined (__bsdi__) || defined (__NetBSD__)
   /* Statistics print out using sysctl (). */
-  vty_outln (vty, "    input packets %llu, bytes %llu, dropped %llu,"
-           " multicast packets %llu",
+  vty_out (vty, "    input packets %llu, bytes %llu, dropped %llu,"
+           " multicast packets %llu\n",
            (unsigned long long)ifp->stats.ifi_ipackets,
            (unsigned long long)ifp->stats.ifi_ibytes,
            (unsigned long long)ifp->stats.ifi_iqdrops,
@@ -1216,8 +1216,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
   vty_out (vty, "    input errors %llu\n",
            (unsigned long long)ifp->stats.ifi_ierrors);
 
-  vty_outln (vty, "    output packets %llu, bytes %llu,"
-           " multicast packets %llu",
+  vty_out (vty, "    output packets %llu, bytes %llu,"
+           " multicast packets %llu\n",
            (unsigned long long)ifp->stats.ifi_opackets,
            (unsigned long long)ifp->stats.ifi_obytes,
            (unsigned long long)ifp->stats.ifi_omcasts);
@@ -1229,8 +1229,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
            (unsigned long long)ifp->stats.ifi_collisions);
 #else
   /* Statistics print out using sysctl (). */
-  vty_outln (vty, "    input packets %lu, bytes %lu, dropped %lu,"
-	   " multicast packets %lu",
+  vty_out (vty, "    input packets %lu, bytes %lu, dropped %lu,"
+	   " multicast packets %lu\n",
 	   ifp->stats.ifi_ipackets, ifp->stats.ifi_ibytes,
 	   ifp->stats.ifi_iqdrops,ifp->stats.ifi_imcasts);
 
diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 4f19a873b..3c727ecb7 100644
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -478,8 +478,8 @@ DEFUN (ip_irdp_minadvertinterval,
       return CMD_SUCCESS;
   }
   else {
-      vty_outln (vty, "%% MinAdvertInterval must be less than or equal to "
-                      "MaxAdvertInterval");
+      vty_out (vty, "%% MinAdvertInterval must be less than or equal to "
+                      "MaxAdvertInterval\n");
       return CMD_WARNING;
   }
 }
@@ -505,8 +505,8 @@ DEFUN (ip_irdp_maxadvertinterval,
       return CMD_SUCCESS;
   }
   else {
-      vty_outln (vty, "%% MaxAdvertInterval must be greater than or equal to "
-                      "MinAdvertInterval");
+      vty_out (vty, "%% MaxAdvertInterval must be greater than or equal to "
+                      "MinAdvertInterval\n");
       return CMD_WARNING;
   }
 }
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index fc21ada3a..ab1643e50 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -302,7 +302,7 @@ DEFUN (match_source_protocol,
   i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   return zebra_route_match_add (vty, "source-protocol", proto, RMAP_EVENT_MATCH_ADDED);
@@ -459,7 +459,7 @@ DEFUN (ip_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (proto_rm[AFI_IP][i])
@@ -500,7 +500,7 @@ DEFUN (no_ip_protocol,
 
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
      return CMD_WARNING;
     }
 
@@ -566,7 +566,7 @@ DEFUN (ipv6_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (proto_rm[AFI_IP6][i])
@@ -606,7 +606,7 @@ DEFUN (no_ipv6_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
      return CMD_WARNING;
     }
   if (!proto_rm[AFI_IP6][i])
@@ -672,7 +672,7 @@ DEFUN (ip_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (nht_rm[AFI_IP][i])
@@ -707,7 +707,7 @@ DEFUN (no_ip_protocol_nht_rmap,
 
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
 
@@ -770,7 +770,7 @@ DEFUN (ipv6_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (nht_rm[AFI_IP6][i])
@@ -801,13 +801,13 @@ DEFUN (no_ipv6_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
 
   if (nht_rm[AFI_IP6][i] && rmap && strcmp(rmap, nht_rm[AFI_IP6][i]))
     {
-      vty_outln (vty, "invalid route-map \"%s\"", rmap);
+      vty_out (vty, "invalid route-map \"%s\"\n", rmap);
       return CMD_WARNING;
     }
 
diff --git a/zebra/zserv.c b/zebra/zserv.c
index bee70f951..a89f4f591 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2855,7 +2855,7 @@ DEFUN (show_zebra,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     {
       struct zebra_vrf *zvrf = vrf->info;
-      vty_outln (vty,"%-25s %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 "",
+      vty_out (vty,"%-25s %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 "\n",
                vrf->name, zvrf->installs, zvrf->removals,
                zvrf->neigh_updates, zvrf->lsp_installs,zvrf->lsp_removals);
     }