Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3

Conflicts:
	bgpd/bgp_route.c

1 files changed, 10 insertions, 9 deletions

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 00b604c265..3e408c929c 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1438,8 +1438,8 @@ zfpm_start_stats_timer (void)
  */
 #define ZFPM_SHOW_STAT(counter)						\
   do {									\
-    vty_out (vty, "%-40s %10lu %16lu%s", #counter, total_stats.counter,	\
-	     zfpm_g->last_ivl_stats.counter, VTY_NEWLINE);		\
+    vty_outln (vty, "%-40s %10lu %16lu", #counter, total_stats.counter,	\
+	     zfpm_g->last_ivl_stats.counter);		\
   } while (0)
 
 /*
@@ -1451,8 +1451,8 @@ zfpm_show_stats (struct vty *vty)
   zfpm_stats_t total_stats;
   time_t elapsed;
 
-  vty_out (vty, "%s%-40s %10s     Last %2d secs%s%s", VTY_NEWLINE, "Counter",
-	   "Total", ZFPM_STATS_IVL_SECS, VTY_NEWLINE, VTY_NEWLINE);
+  vty_outln (vty, "%s%-40s %10s     Last %2d secs%s", VTYNL, "Counter",
+	   "Total", ZFPM_STATS_IVL_SECS, VTYNL);
 
   /*
    * Compute the total stats up to this instant.
@@ -1490,8 +1490,8 @@ zfpm_show_stats (struct vty *vty)
 
   elapsed = zfpm_get_elapsed_time (zfpm_g->last_stats_clear_time);
 
-  vty_out (vty, "%sStats were cleared %lu seconds ago%s", VTY_NEWLINE,
-	   (unsigned long) elapsed, VTY_NEWLINE);
+  vty_outln (vty, "%sStats were cleared %lu seconds ago", VTYNL,
+	   (unsigned long)elapsed);
 }
 
 /*
@@ -1502,7 +1502,7 @@ zfpm_clear_stats (struct vty *vty)
 {
   if (!zfpm_is_enabled ())
     {
-      vty_out (vty, "The FPM module is not enabled...%s", VTY_NEWLINE);
+      vty_outln (vty, "The FPM module is not enabled...");
       return;
     }
 
@@ -1515,7 +1515,7 @@ zfpm_clear_stats (struct vty *vty)
 
   zfpm_g->last_stats_clear_time = monotime(NULL);
 
-  vty_out (vty, "Cleared FPM stats%s", VTY_NEWLINE);
+  vty_outln (vty, "Cleared FPM stats");
 }
 
 /*
@@ -1671,7 +1671,8 @@ static int fpm_remote_srv_write (struct vty *vty)
 
    if (zfpm_g->fpm_server != FPM_DEFAULT_IP || 
           zfpm_g->fpm_port != FPM_DEFAULT_PORT)
-      vty_out (vty,"fpm connection ip %s port %d%s", inet_ntoa (in),zfpm_g->fpm_port,VTY_NEWLINE);
+      vty_outln (vty,"fpm connection ip %s port %d", inet_ntoa (in),
+                 zfpm_g->fpm_port);
 
    return 0;
 }