*: remove VTYNL, part 4 of 6

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

13 files changed, 302 insertions, 339 deletions

diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index b1f2401d5..314fe4873 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -1066,16 +1066,16 @@ ospf6_inter_area_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   prefix_lsa = (struct ospf6_inter_prefix_lsa *)
     OSPF6_LSA_HEADER_END (lsa->header);
 
-  vty_out (vty, "     Metric: %lu%s",
-           (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa), VTYNL);
+  vty_out (vty, "     Metric: %lu\n",
+           (u_long) OSPF6_ABR_SUMMARY_METRIC (prefix_lsa));
 
   ospf6_prefix_options_printbuf (prefix_lsa->prefix.prefix_options,
                                  buf, sizeof (buf));
-  vty_out (vty, "     Prefix Options: %s%s", buf, VTYNL);
+  vty_out (vty, "     Prefix Options: %s\n", buf);
 
-  vty_out (vty, "     Prefix: %s%s",
+  vty_out (vty, "     Prefix: %s\n",
 	   ospf6_inter_area_prefix_lsa_get_prefix_str (lsa, buf, sizeof(buf),
-						       0), VTYNL);
+						       0));
 
   return 0;
 }
@@ -1109,12 +1109,12 @@ ospf6_inter_area_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     OSPF6_LSA_HEADER_END (lsa->header);
 
   ospf6_options_printbuf (router_lsa->options, buf, sizeof (buf));
-  vty_out (vty, "     Options: %s%s", buf, VTYNL);
-  vty_out (vty, "     Metric: %lu%s",
-           (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa), VTYNL);
+  vty_out (vty, "     Options: %s\n", buf);
+  vty_out (vty, "     Metric: %lu\n",
+           (u_long) OSPF6_ABR_SUMMARY_METRIC (router_lsa));
 
   inet_ntop (AF_INET, &router_lsa->router_id, buf, sizeof (buf));
-  vty_out (vty, "     Destination Router ID: %s%s", buf, VTYNL);
+  vty_out (vty, "     Destination Router ID: %s\n", buf);
 
   return 0;
 }
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index 7ee5c9b6e..102eb5e0e 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -371,20 +371,20 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   unsigned long result;
 
   if (!IS_AREA_STUB (oa))
-    vty_out (vty, " Area %s%s", oa->name, VTYNL);
+    vty_out (vty, " Area %s\n", oa->name);
   else
     {
       if (oa->no_summary)
 	{
-	  vty_out (vty, " Area %s[Stub, No Summary]%s", oa->name, VTYNL);
+	  vty_out (vty, " Area %s[Stub, No Summary]\n", oa->name);
 	}
       else
 	{
-	  vty_out (vty, " Area %s[Stub]%s", oa->name, VTYNL);
+	  vty_out (vty, " Area %s[Stub]\n", oa->name);
 	}
     }
-  vty_out (vty, "     Number of Area scoped LSAs is %u%s",
-           oa->lsdb->count, VTYNL);
+  vty_out (vty, "     Number of Area scoped LSAs is %u\n",
+           oa->lsdb->count);
 
   vty_out (vty, "     Interface attached to this area:");
   for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi))
@@ -417,7 +417,7 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   u_int32_t area_id = htonl (strtoul (str, &ep, 10));      \
   if (*ep && inet_pton (AF_INET, str, &area_id) != 1)      \
     {                                                      \
-      vty_out (vty, "Malformed Area-ID: %s%s", str, VTYNL);  \
+      vty_out (vty, "Malformed Area-ID: %s\n", str);  \
       return CMD_SUCCESS;                                  \
     }                                                      \
   int format = !*ep ? OSPF6_AREA_FMT_DECIMAL :             \
@@ -454,7 +454,7 @@ DEFUN (area_range,
   ret = str2prefix (argv[idx_ipv6_prefixlen]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6_prefixlen]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[idx_ipv6_prefixlen]->arg);
       return CMD_SUCCESS;
     }
 
@@ -528,14 +528,14 @@ DEFUN (no_area_range,
   ret = str2prefix (argv[idx_ipv6]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[idx_ipv6]->arg);
       return CMD_SUCCESS;
     }
 
   range = ospf6_route_lookup (&prefix, oa->range_table);
   if (range == NULL)
     {
-      vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv6]->arg, VTYNL);
+      vty_out (vty, "Range %s does not exists.\n", argv[idx_ipv6]->arg);
       return CMD_SUCCESS;
     }
 
@@ -589,22 +589,22 @@ ospf6_area_config_write (struct vty *vty)
       if (IS_AREA_STUB (oa))
 	{
 	  if (oa->no_summary)
-	    vty_out (vty, " area %s stub no-summary%s", oa->name, VTYNL);
+	    vty_out (vty, " area %s stub no-summary\n", oa->name);
 	  else
-	    vty_out (vty, " area %s stub%s", oa->name, VTYNL);
+	    vty_out (vty, " area %s stub\n", oa->name);
 	}
       if (PREFIX_NAME_IN (oa))
-        vty_out (vty, " area %s filter-list prefix %s in%s",
-                 oa->name, PREFIX_NAME_IN (oa), VTYNL);
+        vty_out (vty, " area %s filter-list prefix %s in\n",
+                 oa->name, PREFIX_NAME_IN (oa));
       if (PREFIX_NAME_OUT (oa))
-        vty_out (vty, " area %s filter-list prefix %s out%s",
-                 oa->name, PREFIX_NAME_OUT (oa), VTYNL);
+        vty_out (vty, " area %s filter-list prefix %s out\n",
+                 oa->name, PREFIX_NAME_OUT (oa));
       if (IMPORT_NAME (oa))
-        vty_out (vty, " area %s import-list %s%s",
-                 oa->name, IMPORT_NAME (oa), VTYNL);
+        vty_out (vty, " area %s import-list %s\n",
+                 oa->name, IMPORT_NAME (oa));
       if (EXPORT_NAME (oa))
-        vty_out (vty, " area %s export-list %s%s",
-                 oa->name, EXPORT_NAME (oa), VTYNL);
+        vty_out (vty, " area %s export-list %s\n",
+                 oa->name, EXPORT_NAME (oa));
     }
 }
 
@@ -831,8 +831,8 @@ DEFUN (show_ipv6_ospf6_spf_tree,
       route = ospf6_route_lookup (&prefix, oa->spf_table);
       if (route == NULL)
         {
-          vty_out (vty, "LS entry for root not found in area %s%s",
-                   oa->name, VTYNL);
+          vty_out (vty, "LS entry for root not found in area %s\n",
+                   oa->name);
           continue;
         }
       root = (struct ospf6_vertex *) route->route_option;
@@ -866,21 +866,21 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
 
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "Malformed Area-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "No such Area: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
   route = ospf6_route_lookup (&prefix, oa->spf_table);
   if (route == NULL)
     {
-      vty_out (vty, "LS entry for root not found in area %s%s",
-               oa->name, VTYNL);
+      vty_out (vty, "LS entry for root not found in area %s\n",
+               oa->name);
       return CMD_SUCCESS;
     }
   root = (struct ospf6_vertex *) route->route_option;
@@ -919,13 +919,13 @@ DEFUN (show_ipv6_ospf6_simulate_spf_tree_root,
 
   if (inet_pton (AF_INET, argv[idx_ipv4_2]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
+      vty_out (vty, "Malformed Area-ID: %s\n", argv[idx_ipv4_2]->arg);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
+      vty_out (vty, "No such Area: %s\n", argv[idx_ipv4_2]->arg);
       return CMD_SUCCESS;
     }
 
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 57b1e9481..37c780795 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -759,11 +759,11 @@ ospf6_redistribute_config_write (struct vty *vty)
         continue;
 
       if (ospf6->rmap[type].name)
-        vty_out (vty, " redistribute %s route-map %s%s",
-                 ZROUTE_NAME (type), ospf6->rmap[type].name, VTYNL);
+        vty_out (vty, " redistribute %s route-map %s\n",
+                 ZROUTE_NAME (type), ospf6->rmap[type].name);
       else
-        vty_out (vty, " redistribute %s%s",
-                 ZROUTE_NAME (type), VTYNL);
+        vty_out (vty, " redistribute %s\n",
+                 ZROUTE_NAME (type));
     }
 
   return 0;
@@ -803,10 +803,10 @@ ospf6_redistribute_show_config (struct vty *vty)
                  (ospf6->rmap[type].map ? "" : " (not found !)"),
                  VTYNL);
       else
-        vty_out (vty, "    %d: %s%s", nroute[type],
-                 ZROUTE_NAME (type), VTYNL);
+        vty_out (vty, "    %d: %s\n", nroute[type],
+                 ZROUTE_NAME (type));
     }
-  vty_out (vty, "Total %d routes%s", total, VTYNL);
+  vty_out (vty, "Total %d routes\n", total);
 }
 
 
@@ -1247,28 +1247,24 @@ ospf6_as_external_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_F) ? 'F' : '-'),
     (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T) ? 'T' : '-'));
 
-  vty_out (vty, "     Bits: %s%s", buf, VTYNL);
-  vty_out (vty, "     Metric: %5lu%s", (u_long) OSPF6_ASBR_METRIC (external),
-           VTYNL);
+  vty_out (vty, "     Bits: %s\n", buf);
+  vty_out (vty, "     Metric: %5lu\n", (u_long) OSPF6_ASBR_METRIC (external));
 
   ospf6_prefix_options_printbuf (external->prefix.prefix_options,
                                  buf, sizeof (buf));
-  vty_out (vty, "     Prefix Options: %s%s", buf,
-           VTYNL);
+  vty_out (vty, "     Prefix Options: %s\n", buf);
 
-  vty_out (vty, "     Referenced LSType: %d%s",
-           ntohs (external->prefix.prefix_refer_lstype),
-           VTYNL);
+  vty_out (vty, "     Referenced LSType: %d\n",
+           ntohs (external->prefix.prefix_refer_lstype));
 
-  vty_out (vty, "     Prefix: %s%s",
-	   ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 0), VTYNL);
+  vty_out (vty, "     Prefix: %s\n",
+	   ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 0));
 
   /* Forwarding-Address */
   if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_F))
     {
-      vty_out (vty, "     Forwarding-Address: %s%s",
-	       ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 1),
-	       VTYNL);
+      vty_out (vty, "     Forwarding-Address: %s\n",
+	       ospf6_as_external_lsa_get_prefix_str (lsa, buf, sizeof(buf), 1));
     }
 
   /* Tag */
@@ -1297,12 +1293,12 @@ ospf6_asbr_external_route_show (struct vty *vty, struct ospf6_route *route)
     snprintf (forwarding, sizeof (forwarding), ":: (ifindex %d)",
               ospf6_route_get_first_nh_index (route));
 
-  vty_out (vty, "%c %-32s %-15s type-%d %5lu %s%s",
+  vty_out (vty, "%c %-32s %-15s type-%d %5lu %s\n",
            zebra_route_char(info->type),
            prefix, id, route->path.metric_type,
            (u_long) (route->path.metric_type == 2 ?
                      route->path.u.cost_e2 : route->path.cost),
-           forwarding, VTYNL);
+           forwarding);
 }
 
 DEFUN (show_ipv6_ospf6_redistribute,
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index c5026e2f7..adfc14879 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -917,10 +917,9 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
   else
     type = "UNKNOWN";
 
-  vty_out (vty, "%s is %s, type %s%s",
-           ifp->name, updown[if_is_operative (ifp)], type,
-	   VTYNL);
-  vty_out (vty, "  Interface ID: %d%s", ifp->ifindex, VTYNL);
+  vty_out (vty, "%s is %s, type %s\n",
+           ifp->name, updown[if_is_operative (ifp)], type);
+  vty_out (vty, "  Interface ID: %d\n", ifp->ifindex);
 
   if (ifp->info == NULL)
     {
@@ -939,49 +938,43 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
       switch (p->family)
         {
         case AF_INET:
-          vty_out (vty, "    inet : %s%s", strbuf,
-		   VTYNL);
+          vty_out (vty, "    inet : %s\n", strbuf);
           break;
         case AF_INET6:
-          vty_out (vty, "    inet6: %s%s", strbuf,
-		   VTYNL);
+          vty_out (vty, "    inet6: %s\n", strbuf);
           break;
         default:
-          vty_out (vty, "    ???  : %s%s", strbuf,
-		   VTYNL);
+          vty_out (vty, "    ???  : %s\n", strbuf);
           break;
         }
     }
 
   if (oi->area)
     {
-      vty_out (vty, "  Instance ID %d, Interface MTU %d (autodetect: %d)%s",
-	       oi->instance_id, oi->ifmtu, ifp->mtu6, VTYNL);
-      vty_out (vty, "  MTU mismatch detection: %s%s", oi->mtu_ignore ?
-	       "disabled" : "enabled", VTYNL);
+      vty_out (vty, "  Instance ID %d, Interface MTU %d (autodetect: %d)\n",
+	       oi->instance_id, oi->ifmtu, ifp->mtu6);
+      vty_out (vty, "  MTU mismatch detection: %s\n", oi->mtu_ignore ?
+	       "disabled" : "enabled");
       inet_ntop (AF_INET, &oi->area->area_id,
                  strbuf, sizeof (strbuf));
-      vty_out (vty, "  Area ID %s, Cost %u%s", strbuf, oi->cost,
-	       VTYNL);
+      vty_out (vty, "  Area ID %s, Cost %u\n", strbuf, oi->cost);
     }
   else
     vty_out (vty, "  Not Attached to Area\n");
 
-  vty_out (vty, "  State %s, Transmit Delay %d sec, Priority %d%s",
+  vty_out (vty, "  State %s, Transmit Delay %d sec, Priority %d\n",
            ospf6_interface_state_str[oi->state],
-           oi->transdelay, oi->priority,
-	   VTYNL);
+           oi->transdelay, oi->priority);
   vty_out (vty, "  Timer intervals configured:\n");
-  vty_out (vty, "   Hello %d, Dead %d, Retransmit %d%s",
-           oi->hello_interval, oi->dead_interval, oi->rxmt_interval,
-	   VTYNL);
+  vty_out (vty, "   Hello %d, Dead %d, Retransmit %d\n",
+           oi->hello_interval, oi->dead_interval, oi->rxmt_interval);
 
   inet_ntop (AF_INET, &oi->drouter, drouter, sizeof (drouter));
   inet_ntop (AF_INET, &oi->bdrouter, bdrouter, sizeof (bdrouter));
-  vty_out (vty, "  DR: %s BDR: %s%s", drouter, bdrouter, VTYNL);
+  vty_out (vty, "  DR: %s BDR: %s\n", drouter, bdrouter);
 
-  vty_out (vty, "  Number of I/F scoped LSAs is %u%s",
-           oi->lsdb->count, VTYNL);
+  vty_out (vty, "  Number of I/F scoped LSAs is %u\n",
+           oi->lsdb->count);
 
   monotime(&now);
 
@@ -989,25 +982,23 @@ ospf6_interface_show (struct vty *vty, struct interface *ifp)
   if (oi->thread_send_lsupdate)
     timersub (&oi->thread_send_lsupdate->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]\n",
            oi->lsupdate_list->count, duration,
-           (oi->thread_send_lsupdate ? "on" : "off"),
-           VTYNL);
+           (oi->thread_send_lsupdate ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (oi->lsupdate_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   timerclear (&res);
   if (oi->thread_send_lsack)
     timersub (&oi->thread_send_lsack->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]\n",
            oi->lsack_list->count, duration,
-           (oi->thread_send_lsack ? "on" : "off"),
-           VTYNL);
+           (oi->thread_send_lsack ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (oi->lsack_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
   ospf6_bfd_show_info(vty, oi->bfd_info, 1);
   return 0;
 }
@@ -1031,8 +1022,7 @@ DEFUN (show_ipv6_ospf6_interface,
       ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT);
       if (ifp == NULL)
         {
-          vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg,
-                   VTYNL);
+          vty_out (vty, "No such Interface: %s\n", argv[idx_ifname]->arg);
           return CMD_WARNING;
         }
       ospf6_interface_show (vty, ifp);
@@ -1068,14 +1058,14 @@ DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
   ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT);
   if (ifp == NULL)
     {
-      vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VTYNL);
+      vty_out (vty, "No such Interface: %s\n", argv[idx_ifname]->arg);
       return CMD_WARNING;
     }
 
   oi = ifp->info;
   if (oi == NULL)
     {
-      vty_out (vty, "OSPFv3 is not enabled on %s%s", argv[idx_ifname]->arg, VTYNL);
+      vty_out (vty, "OSPFv3 is not enabled on %s\n", argv[idx_ifname]->arg);
       return CMD_WARNING;
     }
 
@@ -1145,8 +1135,8 @@ DEFUN (ipv6_ospf6_ifmtu,
 
   if (ifp->mtu6 != 0 && ifp->mtu6 < ifmtu)
     {
-      vty_out (vty, "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)%s",
-               ifp->name, ifp->mtu6, VTYNL);
+      vty_out (vty, "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)\n",
+               ifp->name, ifp->mtu6);
       return CMD_WARNING;
     }
 
@@ -1155,8 +1145,8 @@ DEFUN (ipv6_ospf6_ifmtu,
       iobuflen = ospf6_iobuf_size (ifmtu);
       if (iobuflen < ifmtu)
         {
-          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VTYNL);
+          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).\n",
+                   ifp->name, iobuflen);
           oi->ifmtu = oi->c_ifmtu = iobuflen;
         }
       else
@@ -1203,8 +1193,8 @@ DEFUN (no_ipv6_ospf6_ifmtu,
       iobuflen = ospf6_iobuf_size (ifp->mtu);
       if (iobuflen < ifp->mtu)
         {
-          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VTYNL);
+          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).\n",
+                   ifp->name, iobuflen);
           oi->ifmtu = iobuflen;
         }
       else
@@ -1250,7 +1240,7 @@ DEFUN (ipv6_ospf6_cost,
 
   if (lcost > UINT32_MAX)
     {
-      vty_out (vty, "Cost %ld is out of range%s", lcost, VTYNL);
+      vty_out (vty, "Cost %ld is out of range\n", lcost);
       return CMD_WARNING;
     }
   
@@ -1769,45 +1759,45 @@ config_write_ospf6_interface (struct vty *vty)
       if (oi == NULL)
         continue;
 
-      vty_out (vty, "interface %s%s",
-               oi->interface->name, VTYNL);
+      vty_out (vty, "interface %s\n",
+               oi->interface->name);
 
       if (ifp->desc)
-        vty_out (vty, " description %s%s", ifp->desc, VTYNL);
+        vty_out (vty, " description %s\n", ifp->desc);
       if (oi->c_ifmtu)
-        vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->c_ifmtu, VTYNL);
+        vty_out (vty, " ipv6 ospf6 ifmtu %d\n", oi->c_ifmtu);
 
       if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
-        vty_out (vty, " ipv6 ospf6 cost %d%s",
-                 oi->cost, VTYNL);
+        vty_out (vty, " ipv6 ospf6 cost %d\n",
+                 oi->cost);
 
       if (oi->hello_interval != OSPF6_INTERFACE_HELLO_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 hello-interval %d%s",
-                 oi->hello_interval, VTYNL);
+        vty_out (vty, " ipv6 ospf6 hello-interval %d\n",
+                 oi->hello_interval);
 
       if (oi->dead_interval != OSPF6_INTERFACE_DEAD_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
-                 oi->dead_interval, VTYNL);
+        vty_out (vty, " ipv6 ospf6 dead-interval %d\n",
+                 oi->dead_interval);
 
       if (oi->rxmt_interval != OSPF6_INTERFACE_RXMT_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",
-                 oi->rxmt_interval, VTYNL);
+        vty_out (vty, " ipv6 ospf6 retransmit-interval %d\n",
+                 oi->rxmt_interval);
 
       if (oi->priority != OSPF6_INTERFACE_PRIORITY)
-        vty_out (vty, " ipv6 ospf6 priority %d%s",
-                 oi->priority, VTYNL);
+        vty_out (vty, " ipv6 ospf6 priority %d\n",
+                 oi->priority);
 
       if (oi->transdelay != OSPF6_INTERFACE_TRANSDELAY)
-        vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",
-                 oi->transdelay, VTYNL);
+        vty_out (vty, " ipv6 ospf6 transmit-delay %d\n",
+                 oi->transdelay);
 
       if (oi->instance_id != OSPF6_INTERFACE_INSTANCE_ID)
-        vty_out (vty, " ipv6 ospf6 instance-id %d%s",
-                 oi->instance_id, VTYNL);
+        vty_out (vty, " ipv6 ospf6 instance-id %d\n",
+                 oi->instance_id);
 
       if (oi->plist_name)
-        vty_out (vty, " ipv6 ospf6 advertise prefix-list %s%s",
-                 oi->plist_name, VTYNL);
+        vty_out (vty, " ipv6 ospf6 advertise prefix-list %s\n",
+                 oi->plist_name);
 
       if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE))
         vty_out (vty, " ipv6 ospf6 passive\n");
@@ -1922,7 +1912,7 @@ DEFUN (clear_ipv6_ospf6_interface,
     {
       if ((ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT)) == NULL)
         {
-          vty_out (vty, "No such Interface: %s%s", argv[idx_ifname]->arg, VTYNL);
+          vty_out (vty, "No such Interface: %s\n", argv[idx_ifname]->arg);
           return CMD_WARNING;
         }
       ospf6_interface_clear (vty, ifp);
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 2f4e06e1e..41271d802 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -105,7 +105,7 @@ ospf6_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
 
   ospf6_capability_printbuf (router_lsa->bits, bits, sizeof (bits));
   ospf6_options_printbuf (router_lsa->options, options, sizeof (options));
-  vty_out (vty, "    Bits: %s Options: %s%s", bits, options, VTYNL);
+  vty_out (vty, "    Bits: %s Options: %s\n", bits, options);
 
   start = (char *) router_lsa + sizeof (struct ospf6_router_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length);
@@ -125,17 +125,17 @@ ospf6_router_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
       else
         snprintf (name, sizeof (name), "Unknown (%#x)", lsdesc->type);
 
-      vty_out (vty, "    Type: %s Metric: %d%s",
-               name, ntohs (lsdesc->metric), VTYNL);
-      vty_out (vty, "    Interface ID: %s%s",
+      vty_out (vty, "    Type: %s Metric: %d\n",
+               name, ntohs (lsdesc->metric));
+      vty_out (vty, "    Interface ID: %s\n",
                inet_ntop (AF_INET, &lsdesc->interface_id,
-                          buf, sizeof (buf)), VTYNL);
-      vty_out (vty, "    Neighbor Interface ID: %s%s",
+                          buf, sizeof (buf)));
+      vty_out (vty, "    Neighbor Interface ID: %s\n",
                inet_ntop (AF_INET, &lsdesc->neighbor_interface_id,
-                          buf, sizeof (buf)), VTYNL);
-      vty_out (vty, "    Neighbor Router ID: %s%s",
+                          buf, sizeof (buf)));
+      vty_out (vty, "    Neighbor Router ID: %s\n",
                inet_ntop (AF_INET, &lsdesc->neighbor_router_id,
-                          buf, sizeof (buf)), VTYNL);
+                          buf, sizeof (buf)));
     }
   return 0;
 }
@@ -408,7 +408,7 @@ ospf6_network_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     ((caddr_t) lsa->header + sizeof (struct ospf6_lsa_header));
 
   ospf6_options_printbuf (network_lsa->options, options, sizeof (options));
-  vty_out (vty, "     Options: %s%s", options, VTYNL);
+  vty_out (vty, "     Options: %s\n", options);
 
   start = (char *) network_lsa + sizeof (struct ospf6_network_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length);
@@ -417,7 +417,7 @@ ospf6_network_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
     {
       lsdesc = (struct ospf6_network_lsdesc *) current;
       inet_ntop (AF_INET, &lsdesc->router_id, buf, sizeof (buf));
-      vty_out (vty, "     Attached Router: %s%s", buf, VTYNL);
+      vty_out (vty, "     Attached Router: %s\n", buf);
     }
   return 0;
 }
@@ -623,10 +623,10 @@ ospf6_link_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   inet_ntop (AF_INET6, &link_lsa->linklocal_addr, buf, sizeof (buf));
   prefixnum = ntohl (link_lsa->prefix_num);
 
-  vty_out (vty, "     Priority: %d Options: %s%s",
-           link_lsa->priority, options, VTYNL);
-  vty_out (vty, "     LinkLocal Address: %s%s", buf, VTYNL);
-  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VTYNL);
+  vty_out (vty, "     Priority: %d Options: %s\n",
+           link_lsa->priority, options);
+  vty_out (vty, "     LinkLocal Address: %s\n", buf);
+  vty_out (vty, "     Number of Prefix: %d\n", prefixnum);
 
   start = (char *) link_lsa + sizeof (struct ospf6_link_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length); 
@@ -645,15 +645,15 @@ ospf6_link_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
            "LA" : "--");
       nu = (CHECK_FLAG (prefix->prefix_options, OSPF6_PREFIX_OPTION_NU) ?
            "NU" : "--");
-      vty_out (vty, "     Prefix Options: %s|%s|%s|%s%s",
-               p, mc, la, nu, VTYNL);
+      vty_out (vty, "     Prefix Options: %s|%s|%s|%s\n",
+               p, mc, la, nu);
 
       memset (&in6, 0, sizeof (in6));
       memcpy (&in6, OSPF6_PREFIX_BODY (prefix),
               OSPF6_PREFIX_SPACE (prefix->prefix_length));
       inet_ntop (AF_INET6, &in6, buf, sizeof (buf));
-      vty_out (vty, "     Prefix: %s/%d%s",
-               buf, prefix->prefix_length, VTYNL);
+      vty_out (vty, "     Prefix: %s/%d\n",
+               buf, prefix->prefix_length);
     }
 
   return 0;
@@ -825,14 +825,13 @@ ospf6_intra_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
 
   prefixnum = ntohs (intra_prefix_lsa->prefix_num);
 
-  vty_out (vty, "     Number of Prefix: %d%s", prefixnum, VTYNL);
+  vty_out (vty, "     Number of Prefix: %d\n", prefixnum);
 
   inet_ntop (AF_INET, &intra_prefix_lsa->ref_id, id, sizeof (id));
   inet_ntop (AF_INET, &intra_prefix_lsa->ref_adv_router,
              adv_router, sizeof (adv_router));
-  vty_out (vty, "     Reference: %s Id: %s Adv: %s%s",
-           ospf6_lstype_name (intra_prefix_lsa->ref_type), id, adv_router,
-           VTYNL);
+  vty_out (vty, "     Reference: %s Id: %s Adv: %s\n",
+           ospf6_lstype_name (intra_prefix_lsa->ref_type), id, adv_router);
 
   start = (char *) intra_prefix_lsa + sizeof (struct ospf6_intra_prefix_lsa);
   end = (char *) lsa->header + ntohs (lsa->header->length); 
@@ -851,15 +850,15 @@ ospf6_intra_prefix_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
            "LA" : "--");
       nu = (CHECK_FLAG (prefix->prefix_options, OSPF6_PREFIX_OPTION_NU) ?
            "NU" : "--");
-      vty_out (vty, "     Prefix Options: %s|%s|%s|%s%s",
-               p, mc, la, nu, VTYNL);
+      vty_out (vty, "     Prefix Options: %s|%s|%s|%s\n",
+               p, mc, la, nu);
 
       memset (&in6, 0, sizeof (in6));
       memcpy (&in6, OSPF6_PREFIX_BODY (prefix),
               OSPF6_PREFIX_SPACE (prefix->prefix_length));
       inet_ntop (AF_INET6, &in6, buf, sizeof (buf));
-      vty_out (vty, "     Prefix: %s/%d%s",
-               buf, prefix->prefix_length, VTYNL);
+      vty_out (vty, "     Prefix: %s/%d\n",
+               buf, prefix->prefix_length);
     }
 
   return 0;
@@ -1798,13 +1797,13 @@ config_write_ospf6_debug_brouter (struct vty *vty)
     {
       inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_router_id,
                  buf, sizeof (buf));
-      vty_out (vty, "debug ospf6 border-routers router-id %s%s", buf, VTYNL);
+      vty_out (vty, "debug ospf6 border-routers router-id %s\n", buf);
     }
   if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA)
     {
       inet_ntop (AF_INET, &conf_debug_ospf6_brouter_specific_area_id,
                  buf, sizeof (buf));
-      vty_out (vty, "debug ospf6 border-routers area-id %s%s", buf, VTYNL);
+      vty_out (vty, "debug ospf6 border-routers area-id %s\n", buf);
     }
   return 0;
 }
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index 3f6263563..7817448b7 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -381,9 +381,9 @@ ospf6_lsa_header_print (struct ospf6_lsa *lsa)
 void
 ospf6_lsa_show_summary_header (struct vty *vty)
 {
-  vty_out (vty, "%-4s %-15s%-15s%4s %8s %30s%s",
+  vty_out (vty, "%-4s %-15s%-15s%4s %8s %30s\n",
            "Type", "LSId", "AdvRouter", "Age", "SeqNum",
-           "Payload", VTYNL);
+           "Payload");
 }
 
 void
@@ -408,11 +408,11 @@ ospf6_lsa_show_summary (struct vty *vty, struct ospf6_lsa *lsa)
       (type == OSPF6_LSTYPE_INTER_ROUTER) ||
       (type == OSPF6_LSTYPE_AS_EXTERNAL))
     {
-      vty_out (vty, "%-4s %-15s%-15s%4hu %8lx %30s%s",
+      vty_out (vty, "%-4s %-15s%-15s%4hu %8lx %30s\n",
 	       ospf6_lstype_short_name (lsa->header->type),
 	       id, adv_router, ospf6_lsa_age_current (lsa),
 	       (u_long) ntohl (lsa->header->seqnum),
-	       handler->get_prefix_str(lsa, buf, sizeof(buf), 0), VTYNL);
+	       handler->get_prefix_str(lsa, buf, sizeof(buf), 0));
     }
   else if (type != OSPF6_LSTYPE_UNKNOWN)
     {
@@ -423,16 +423,16 @@ ospf6_lsa_show_summary (struct vty *vty, struct ospf6_lsa *lsa)
 
       while (handler->get_prefix_str(lsa, buf, sizeof(buf), cnt) != NULL)
 	{
-	  vty_out (vty, "%s %30s%s", tmpbuf, buf, VTYNL);
+	  vty_out (vty, "%s %30s\n", tmpbuf, buf);
 	  cnt++;
 	}
     }
   else
     {
-      vty_out (vty, "%-4s %-15s%-15s%4hu %8lx%s",
+      vty_out (vty, "%-4s %-15s%-15s%4hu %8lx\n",
 	       ospf6_lstype_short_name (lsa->header->type),
 	       id, adv_router, ospf6_lsa_age_current (lsa),
-	       (u_long) ntohl (lsa->header->seqnum), VTYNL);
+	       (u_long) ntohl (lsa->header->seqnum));
     }
 }
 
@@ -446,7 +446,7 @@ ospf6_lsa_show_dump (struct vty *vty, struct ospf6_lsa *lsa)
   end = (u_char *) lsa->header + ntohs (lsa->header->length);
 
   vty_out (vty, "\n");
-  vty_out (vty, "%s:%s", lsa->name, VTYNL);
+  vty_out (vty, "%s:\n", lsa->name);
 
   for (current = start; current < end; current ++)
     {
@@ -475,20 +475,20 @@ ospf6_lsa_show_internal (struct vty *vty, struct ospf6_lsa *lsa)
              adv_router, sizeof (adv_router));
 
   vty_out (vty, "\n");
-  vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa),
-           ospf6_lstype_name (lsa->header->type), VTYNL);
-  vty_out (vty, "Link State ID: %s%s", id, VTYNL);
-  vty_out (vty, "Advertising Router: %s%s", adv_router, VTYNL);
-  vty_out (vty, "LS Sequence Number: %#010lx%s",
-           (u_long) ntohl (lsa->header->seqnum), VTYNL);
-  vty_out (vty, "CheckSum: %#06hx Length: %hu%s",
+  vty_out (vty, "Age: %4hu Type: %s\n", ospf6_lsa_age_current (lsa),
+           ospf6_lstype_name (lsa->header->type));
+  vty_out (vty, "Link State ID: %s\n", id);
+  vty_out (vty, "Advertising Router: %s\n", adv_router);
+  vty_out (vty, "LS Sequence Number: %#010lx\n",
+           (u_long) ntohl (lsa->header->seqnum));
+  vty_out (vty, "CheckSum: %#06hx Length: %hu\n",
            ntohs (lsa->header->checksum),
-           ntohs (lsa->header->length), VTYNL);
-  vty_out (vty, "Flag: %x %s", lsa->flag, VTYNL);
-  vty_out (vty, "Lock: %d %s", lsa->lock, VTYNL);
-  vty_out (vty, "ReTx Count: %d%s", lsa->retrans_count, VTYNL);
-  vty_out (vty, "Threads: Expire: 0x%p, Refresh: 0x%p %s",
-           (void *)lsa->expire, (void *)lsa->refresh, VTYNL);
+           ntohs (lsa->header->length));
+  vty_out (vty, "Flag: %x \n", lsa->flag);
+  vty_out (vty, "Lock: %d \n", lsa->lock);
+  vty_out (vty, "ReTx Count: %d\n", lsa->retrans_count);
+  vty_out (vty, "Threads: Expire: 0x%p, Refresh: 0x%p \n",
+           (void *)lsa->expire, (void *)lsa->refresh);
   vty_out (vty, "\n");
   return;
 }
@@ -511,16 +511,16 @@ ospf6_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   timersub (&now, &lsa->installed, &res);
   timerstring (&res, duration, sizeof (duration));
 
-  vty_out (vty, "Age: %4hu Type: %s%s", ospf6_lsa_age_current (lsa),
-           ospf6_lstype_name (lsa->header->type), VTYNL);
-  vty_out (vty, "Link State ID: %s%s", id, VTYNL);
-  vty_out (vty, "Advertising Router: %s%s", adv_router, VTYNL);
-  vty_out (vty, "LS Sequence Number: %#010lx%s",
-           (u_long) ntohl (lsa->header->seqnum), VTYNL);
-  vty_out (vty, "CheckSum: %#06hx Length: %hu%s",
+  vty_out (vty, "Age: %4hu Type: %s\n", ospf6_lsa_age_current (lsa),
+           ospf6_lstype_name (lsa->header->type));
+  vty_out (vty, "Link State ID: %s\n", id);
+  vty_out (vty, "Advertising Router: %s\n", adv_router);
+  vty_out (vty, "LS Sequence Number: %#010lx\n",
+           (u_long) ntohl (lsa->header->seqnum));
+  vty_out (vty, "CheckSum: %#06hx Length: %hu\n",
            ntohs (lsa->header->checksum),
-           ntohs (lsa->header->length), VTYNL);
-  vty_out (vty, "Duration: %s%s", duration, VTYNL);
+           ntohs (lsa->header->length));
+  vty_out (vty, "Duration: %s\n", duration);
 
   handler = ospf6_get_lsa_handler (lsa->header->type);
   if (handler->show == NULL)
@@ -937,17 +937,17 @@ config_write_ospf6_debug_lsa (struct vty *vty)
       if (handler == NULL)
         continue;
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG))
-        vty_out (vty, "debug ospf6 lsa %s%s",
-                 ospf6_lsa_handler_name (handler), VTYNL);
+        vty_out (vty, "debug ospf6 lsa %s\n",
+                 ospf6_lsa_handler_name (handler));
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_ORIGINATE))
-        vty_out (vty, "debug ospf6 lsa %s originate%s",
-                 ospf6_lsa_handler_name (handler), VTYNL);
+        vty_out (vty, "debug ospf6 lsa %s originate\n",
+                 ospf6_lsa_handler_name (handler));
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_EXAMIN))
-        vty_out (vty, "debug ospf6 lsa %s examine%s",
-                 ospf6_lsa_handler_name (handler), VTYNL);
+        vty_out (vty, "debug ospf6 lsa %s examine\n",
+                 ospf6_lsa_handler_name (handler));
       if (CHECK_FLAG (handler->debug, OSPF6_LSA_DEBUG_FLOOD))
-        vty_out (vty, "debug ospf6 lsa %s flooding%s",
-                 ospf6_lsa_handler_name (handler), VTYNL);
+        vty_out (vty, "debug ospf6 lsa %s flooding\n",
+                 ospf6_lsa_handler_name (handler));
     }
 
   return 0;
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index b087802b3..5924afc38 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -2487,13 +2487,11 @@ config_write_ospf6_debug_message (struct vty *vty)
     {
       if (IS_OSPF6_DEBUG_MESSAGE (i, SEND) &&
           IS_OSPF6_DEBUG_MESSAGE (i, RECV))
-        vty_out (vty, "debug ospf6 message %s%s", type_str[i], VTYNL);
+        vty_out (vty, "debug ospf6 message %s\n", type_str[i]);
       else if (IS_OSPF6_DEBUG_MESSAGE (i, SEND))
-        vty_out (vty, "debug ospf6 message %s send%s", type_str[i],
-                 VTYNL);
+        vty_out (vty, "debug ospf6 message %s send\n", type_str[i]);
       else if (IS_OSPF6_DEBUG_MESSAGE (i, RECV))
-        vty_out (vty, "debug ospf6 message %s recv%s", type_str[i],
-                 VTYNL);
+        vty_out (vty, "debug ospf6 message %s recv\n", type_str[i]);
     }
 
   return 0;
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 99f5830bf..fec992927 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -673,16 +673,16 @@ ospf6_neighbor_show (struct vty *vty, struct ospf6_neighbor *on)
   timerstring (&res, duration, sizeof (duration));
 
   /*
-  vty_out (vty, "%-15s %3d %11s %6s/%-12s %11s %s[%s]%s",
+  vty_out (vty, "%-15s %3d %11s %6s/%-12s %11s %s[%s]\n",
            "Neighbor ID", "Pri", "DeadTime", "State", "", "Duration",
-           "I/F", "State", VTYNL);
+           "I/F", "State");
   */
 
-  vty_out (vty, "%-15s %3d %11s %8s/%-12s %11s %s[%s]%s",
+  vty_out (vty, "%-15s %3d %11s %8s/%-12s %11s %s[%s]\n",
            router_id, on->priority, deadtime,
            ospf6_neighbor_state_str[on->state], nstate, duration,
            on->ospf6_if->interface->name,
-           ospf6_interface_state_str[on->ospf6_if->state], VTYNL);
+           ospf6_interface_state_str[on->ospf6_if->state]);
 }
 
 static void
@@ -694,9 +694,9 @@ ospf6_neighbor_show_drchoice (struct vty *vty, struct ospf6_neighbor *on)
   struct timeval now, res;
 
 /*
-    vty_out (vty, "%-15s %6s/%-11s %-15s %-15s %s[%s]%s",
+    vty_out (vty, "%-15s %6s/%-11s %-15s %-15s %s[%s]\n",
              "RouterID", "State", "Duration", "DR", "BDR", "I/F",
-             "State", VTYNL);
+             "State");
 */
 
   inet_ntop (AF_INET, &on->router_id, router_id, sizeof (router_id));
@@ -707,11 +707,10 @@ ospf6_neighbor_show_drchoice (struct vty *vty, struct ospf6_neighbor *on)
   timersub (&now, &on->last_changed, &res);
   timerstring (&res, duration, sizeof (duration));
 
-  vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]%s",
+  vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]\n",
            router_id, ospf6_neighbor_state_str[on->state],
            duration, drouter, bdrouter, on->ospf6_if->interface->name,
-           ospf6_interface_state_str[on->ospf6_if->state],
-           VTYNL);
+           ospf6_interface_state_str[on->ospf6_if->state]);
 }
 
 static void
@@ -731,94 +730,81 @@ ospf6_neighbor_show_detail (struct vty *vty, struct ospf6_neighbor *on)
   timersub (&now, &on->last_changed, &res);
   timerstring (&res, duration, sizeof (duration));
 
-  vty_out (vty, " Neighbor %s%s", on->name,
-           VTYNL);
-  vty_out (vty, "    Area %s via interface %s (ifindex %d)%s",
+  vty_out (vty, " Neighbor %s\n", on->name);
+  vty_out (vty, "    Area %s via interface %s (ifindex %d)\n",
            on->ospf6_if->area->name,
            on->ospf6_if->interface->name,
-           on->ospf6_if->interface->ifindex,
-           VTYNL);
-  vty_out (vty, "    His IfIndex: %d Link-local address: %s%s",
-           on->ifindex, linklocal_addr,
-           VTYNL);
-  vty_out (vty, "    State %s for a duration of %s%s",
-           ospf6_neighbor_state_str[on->state], duration,
-           VTYNL);
-  vty_out (vty, "    His choice of DR/BDR %s/%s, Priority %d%s",
-           drouter, bdrouter, on->priority,
-           VTYNL);
-  vty_out (vty, "    DbDesc status: %s%s%s SeqNum: %#lx%s",
+           on->ospf6_if->interface->ifindex);
+  vty_out (vty, "    His IfIndex: %d Link-local address: %s\n",
+           on->ifindex, linklocal_addr);
+  vty_out (vty, "    State %s for a duration of %s\n",
+           ospf6_neighbor_state_str[on->state], duration);
+  vty_out (vty, "    His choice of DR/BDR %s/%s, Priority %d\n",
+           drouter, bdrouter, on->priority);
+  vty_out (vty, "    DbDesc status: %s%s%s SeqNum: %#lx\n",
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_IBIT) ? "Initial " : ""),
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MBIT) ? "More " : ""),
            (CHECK_FLAG (on->dbdesc_bits, OSPF6_DBDESC_MSBIT) ?
-            "Master" : "Slave"), (u_long) ntohl (on->dbdesc_seqnum),
-           VTYNL);
+            "Master" : "Slave"), (u_long) ntohl (on->dbdesc_seqnum));
 
-  vty_out (vty, "    Summary-List: %d LSAs%s", on->summary_list->count,
-           VTYNL);
+  vty_out (vty, "    Summary-List: %d LSAs\n", on->summary_list->count);
   for (lsa = ospf6_lsdb_head (on->summary_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
-  vty_out (vty, "    Request-List: %d LSAs%s", on->request_list->count,
-           VTYNL);
+  vty_out (vty, "    Request-List: %d LSAs\n", on->request_list->count);
   for (lsa = ospf6_lsdb_head (on->request_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
-  vty_out (vty, "    Retrans-List: %d LSAs%s", on->retrans_list->count,
-           VTYNL);
+  vty_out (vty, "    Retrans-List: %d LSAs\n", on->retrans_list->count);
   for (lsa = ospf6_lsdb_head (on->retrans_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   timerclear (&res);
   if (on->thread_send_dbdesc)
     timersub (&on->thread_send_dbdesc->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for DbDesc in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for DbDesc in Time %s [thread %s]\n",
            on->dbdesc_list->count, duration,
-           (on->thread_send_dbdesc ? "on" : "off"),
-           VTYNL);
+           (on->thread_send_dbdesc ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (on->dbdesc_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   timerclear (&res);
   if (on->thread_send_lsreq)
     timersub (&on->thread_send_lsreq->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSReq in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for LSReq in Time %s [thread %s]\n",
            on->request_list->count, duration,
-           (on->thread_send_lsreq ? "on" : "off"),
-           VTYNL);
+           (on->thread_send_lsreq ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (on->request_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   timerclear (&res);
   if (on->thread_send_lsupdate)
     timersub (&on->thread_send_lsupdate->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]\n",
            on->lsupdate_list->count, duration,
-           (on->thread_send_lsupdate ? "on" : "off"),
-           VTYNL);
+           (on->thread_send_lsupdate ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (on->lsupdate_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   timerclear (&res);
   if (on->thread_send_lsack)
     timersub (&on->thread_send_lsack->u.sands, &now, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
+  vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]\n",
            on->lsack_list->count, duration,
-           (on->thread_send_lsack ? "on" : "off"),
-           VTYNL);
+           (on->thread_send_lsack ? "on" : "off"));
   for (lsa = ospf6_lsdb_head (on->lsack_list); lsa;
        lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VTYNL);
+    vty_out (vty, "      %s\n", lsa->name);
 
   ospf6_bfd_show_info(vty, on->bfd_info, 0);
 }
@@ -852,13 +838,13 @@ DEFUN (show_ipv6_ospf6_neighbor,
     }
 
   if (showfunc == ospf6_neighbor_show)
-    vty_out (vty, "%-15s %3s %11s %8s/%-12s %11s %s[%s]%s",
+    vty_out (vty, "%-15s %3s %11s %8s/%-12s %11s %s[%s]\n",
              "Neighbor ID", "Pri", "DeadTime", "State", "IfState", "Duration",
-             "I/F", "State", VTYNL);
+             "I/F", "State");
   else if (showfunc == ospf6_neighbor_show_drchoice)
-    vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]%s",
+    vty_out (vty, "%-15s %8s/%-11s %-15s %-15s %s[%s]\n",
              "RouterID", "State", "Duration", "DR", "BDR", "I/F",
-             "State", VTYNL);
+             "State");
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, i, oa))
     for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
@@ -892,8 +878,7 @@ DEFUN (show_ipv6_ospf6_neighbor_one,
 
   if ((inet_pton (AF_INET, argv[idx_ipv4]->arg, &router_id)) != 1)
     {
-      vty_out (vty, "Router-ID is not parsable: %s%s", argv[idx_ipv4]->arg,
-               VTYNL);
+      vty_out (vty, "Router-ID is not parsable: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index 1befbe248..7b01c69a8 100644
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -1043,16 +1043,16 @@ ospf6_route_show (struct vty *vty, struct ospf6_route *route)
 
       if (!i)
 	{
-	  vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s%s",
+	  vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s\n",
 		   (ospf6_route_is_best (route) ? '*' : ' '),
 		   OSPF6_DEST_TYPE_SUBSTR (route->type),
 		   OSPF6_PATH_TYPE_SUBSTR (route->path.type),
-		   destination, nexthop, IFNAMSIZ, ifname, duration, VTYNL);
+		   destination, nexthop, IFNAMSIZ, ifname, duration);
 	  i++;
 	}
       else
-	vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s%s",
-		 ' ', "", "", "", nexthop, IFNAMSIZ, ifname, "", VTYNL);
+	vty_out (vty, "%c%1s %2s %-30s %-25s %6.*s %s\n",
+		 ' ', "", "", "", nexthop, IFNAMSIZ, ifname, "");
     }
 }
 
@@ -1078,66 +1078,63 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
                destination, sizeof (destination));
   else
     prefix2str (&route->prefix, destination, sizeof (destination));
-  vty_out (vty, "Destination: %s%s", destination, VTYNL);
+  vty_out (vty, "Destination: %s\n", destination);
 
   /* destination type */
-  vty_out (vty, "Destination type: %s%s",
-           OSPF6_DEST_TYPE_NAME (route->type),
-           VTYNL);
+  vty_out (vty, "Destination type: %s\n",
+           OSPF6_DEST_TYPE_NAME (route->type));
 
   /* Time */
   timersub (&now, &route->installed, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "Installed Time: %s ago%s", duration, VTYNL);
+  vty_out (vty, "Installed Time: %s ago\n", duration);
 
   timersub (&now, &route->changed, &res);
   timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "  Changed Time: %s ago%s", duration, VTYNL);
+  vty_out (vty, "  Changed Time: %s ago\n", duration);
 
   /* Debugging info */
-  vty_out (vty, "Lock: %d Flags: %s%s%s%s%s", route->lock,
+  vty_out (vty, "Lock: %d Flags: %s%s%s%s\n", route->lock,
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_BEST)   ? "B" : "-"),
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_ADD)    ? "A" : "-"),
            (CHECK_FLAG (route->flag, OSPF6_ROUTE_REMOVE) ? "R" : "-"),
-           (CHECK_FLAG (route->flag, OSPF6_ROUTE_CHANGE) ? "C" : "-"),
-           VTYNL);
-  vty_out (vty, "Memory: prev: %p this: %p next: %p%s",
-           (void *)route->prev, (void *)route, (void *)route->next, VTYNL);
+           (CHECK_FLAG (route->flag, OSPF6_ROUTE_CHANGE) ? "C" : "-"));
+  vty_out (vty, "Memory: prev: %p this: %p next: %p\n",
+           (void *)route->prev, (void *)route, (void *)route->next);
 
   /* Path section */
 
   /* Area-ID */
   inet_ntop (AF_INET, &route->path.area_id, area_id, sizeof (area_id));
-  vty_out (vty, "Associated Area: %s%s", area_id, VTYNL);
+  vty_out (vty, "Associated Area: %s\n", area_id);
 
   /* Path type */
-  vty_out (vty, "Path Type: %s%s",
-           OSPF6_PATH_TYPE_NAME (route->path.type), VTYNL);
+  vty_out (vty, "Path Type: %s\n",
+           OSPF6_PATH_TYPE_NAME (route->path.type));
 
   /* LS Origin */
   inet_ntop (AF_INET, &route->path.origin.id, id, sizeof (id));
   inet_ntop (AF_INET, &route->path.origin.adv_router, adv_router,
              sizeof (adv_router));
-  vty_out (vty, "LS Origin: %s Id: %s Adv: %s%s",
+  vty_out (vty, "LS Origin: %s Id: %s Adv: %s\n",
            ospf6_lstype_name (route->path.origin.type),
-           id, adv_router, VTYNL);
+           id, adv_router);
 
   /* Options */
   ospf6_options_printbuf (route->path.options, options, sizeof (options));
-  vty_out (vty, "Options: %s%s", options, VTYNL);
+  vty_out (vty, "Options: %s\n", options);
 
   /* Router Bits */
   ospf6_capability_printbuf (route->path.router_bits, capa, sizeof (capa));
-  vty_out (vty, "Router Bits: %s%s", capa, VTYNL);
+  vty_out (vty, "Router Bits: %s\n", capa);
 
   /* Prefix Options */
   vty_out (vty, "Prefix Options: xxx\n");
 
   /* Metrics */
-  vty_out (vty, "Metric Type: %d%s", route->path.metric_type,
-           VTYNL);
-  vty_out (vty, "Metric: %d (%d)%s",
-           route->path.cost, route->path.u.cost_e2, VTYNL);
+  vty_out (vty, "Metric Type: %d\n", route->path.metric_type);
+  vty_out (vty, "Metric: %d (%d)\n",
+           route->path.cost, route->path.u.cost_e2);
 
   /* Nexthops */
   vty_out (vty, "Nexthop:\n");
@@ -1146,7 +1143,7 @@ ospf6_route_show_detail (struct vty *vty, struct ospf6_route *route)
       /* nexthop */
       inet_ntop (AF_INET6, &nh->address, nexthop, sizeof (nexthop));
       ifname = ifindex2ifname (nh->ifindex, VRF_DEFAULT);
-      vty_out (vty, "  %s %.*s%s", nexthop, IFNAMSIZ, ifname, VTYNL);
+      vty_out (vty, "  %s %.*s\n", nexthop, IFNAMSIZ, ifname);
     }
   vty_out (vty, "\n");
 }
@@ -1184,14 +1181,14 @@ ospf6_route_show_table_summary (struct vty *vty,
 
   assert (number == table->count);
 
-  vty_out (vty, "Number of OSPFv3 routes: %d%s", number, VTYNL);
-  vty_out (vty, "Number of Destination: %d%s", destination, VTYNL);
-  vty_out (vty, "Number of Alternative routes: %d%s", alternative, VTYNL);
-  vty_out (vty, "Number of Equal Cost Multi Path: %d%s", ecmp, VTYNL);
+  vty_out (vty, "Number of OSPFv3 routes: %d\n", number);
+  vty_out (vty, "Number of Destination: %d\n", destination);
+  vty_out (vty, "Number of Alternative routes: %d\n", alternative);
+  vty_out (vty, "Number of Equal Cost Multi Path: %d\n", ecmp);
   for (i = OSPF6_PATH_TYPE_INTRA; i <= OSPF6_PATH_TYPE_EXTERNAL2; i++)
     {
-      vty_out (vty, "Number of %s routes: %d%s",
-               OSPF6_PATH_TYPE_NAME (i), pathtype[i], VTYNL);
+      vty_out (vty, "Number of %s routes: %d\n",
+               OSPF6_PATH_TYPE_NAME (i), pathtype[i]);
     }
 }
 
@@ -1364,7 +1361,7 @@ ospf6_route_table_show (struct vty *vty, int argc_start, int argc, struct cmd_to
           continue;
         }
 
-      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[i]->arg);
       return CMD_SUCCESS;
     }
 
@@ -1400,8 +1397,8 @@ ospf6_route_table_show (struct vty *vty, int argc_start, int argc, struct cmd_to
 static void
 ospf6_linkstate_show_header (struct vty *vty)
 {
-  vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %s%s",
-           "Type", "Router-ID", "Net-ID", "Rtr-Bits", "Options", "Cost", VTYNL);
+  vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %s\n",
+           "Type", "Router-ID", "Net-ID", "Rtr-Bits", "Options", "Cost");
 }
 
 static void
@@ -1419,13 +1416,13 @@ ospf6_linkstate_show (struct vty *vty, struct ospf6_route *route)
   ospf6_options_printbuf (route->path.options, options, sizeof (options));
 
   if (ntohl (id))
-    vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu%s",
+    vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu\n",
              "Network", routername, idname, rbits, options,
-             (unsigned long) route->path.cost, VTYNL);
+             (unsigned long) route->path.cost);
   else
-    vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu%s",
+    vty_out (vty, "%-7s %-15s %-15s %-8s %-14s %lu\n",
              "Router", routername, idname, rbits, options,
-             (unsigned long) route->path.cost, VTYNL);
+             (unsigned long) route->path.cost);
 }
 
 
@@ -1502,7 +1499,7 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
               is_router++;
               continue;
             }
-          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
+          vty_out (vty, "Malformed argument: %s\n", argv[i]->arg);
           return CMD_SUCCESS;
         }
 
@@ -1514,11 +1511,11 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
               is_id++;
               continue;
             }
-          vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
+          vty_out (vty, "Malformed argument: %s\n", argv[i]->arg);
           return CMD_SUCCESS;
         }
 
-      vty_out (vty, "Malformed argument: %s%s", argv[i]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[i]->arg);
       return CMD_SUCCESS;
     }
 
@@ -1538,8 +1535,8 @@ ospf6_linkstate_table_show (struct vty *vty, int idx_ipv4, int argc,
 void
 ospf6_brouter_show_header (struct vty *vty)
 {
-  vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
-           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VTYNL);
+  vty_out (vty, "%-15s %-8s %-14s %-10s %-15s\n",
+           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area");
 }
 
 void
@@ -1554,11 +1551,11 @@ ospf6_brouter_show (struct vty *vty, struct ospf6_route *route)
   ospf6_options_printbuf (route->path.options, options, sizeof (options));
   inet_ntop (AF_INET, &route->path.area_id, area, sizeof (area));
 
-  /* vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
-           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area", VTYNL); */
-  vty_out (vty, "%-15s %-8s %-14s %-10s %-15s%s",
+  /* vty_out (vty, "%-15s %-8s %-14s %-10s %-15s\n",
+           "Router-ID", "Rtr-Bits", "Options", "Path-Type", "Area"); */
+  vty_out (vty, "%-15s %-8s %-14s %-10s %-15s\n",
            adv, rbits, options, OSPF6_PATH_TYPE_NAME (route->path.type),
-           area, VTYNL);
+           area);
 }
 
 DEFUN (debug_ospf6_route,
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index c9f1740a9..a1a5fbd70 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -742,7 +742,7 @@ ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest,
   int restnum;
 
   /* "prefix" is the space prefix of the display line */
-  vty_out (vty, "%s+-%s [%d]%s", prefix, v->name, v->cost, VTYNL);
+  vty_out (vty, "%s+-%s [%d]\n", prefix, v->name, v->cost);
 
   len = strlen (prefix) + 4;
   next_prefix = (char *) malloc (len);
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 9040e4ab9..6acaf35e9 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -343,7 +343,7 @@ DEFUN (ospf6_router_id,
   ret = inet_pton (AF_INET, argv[idx_ipv4]->arg, &router_id);
   if (ret == 0)
     {
-      vty_out (vty, "malformed OSPF Router-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "malformed OSPF Router-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
@@ -588,15 +588,15 @@ DEFUN (ospf6_interface_area,
     oi = ospf6_interface_create (ifp);
   if (oi->area)
     {
-      vty_out (vty, "%s already attached to Area %s%s",
-               oi->interface->name, oi->area->name, VTYNL);
+      vty_out (vty, "%s already attached to Area %s\n",
+               oi->interface->name, oi->area->name);
       return CMD_SUCCESS;
     }
 
   /* parse Area-ID */
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "Invalid Area-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
@@ -645,35 +645,35 @@ DEFUN (no_ospf6_interface_area,
   ifp = if_lookup_by_name (argv[idx_ifname]->arg, VRF_DEFAULT);
   if (ifp == NULL)
     {
-      vty_out (vty, "No such interface %s%s", argv[idx_ifname]->arg, VTYNL);
+      vty_out (vty, "No such interface %s\n", argv[idx_ifname]->arg);
       return CMD_SUCCESS;
     }
 
   oi = (struct ospf6_interface *) ifp->info;
   if (oi == NULL)
     {
-      vty_out (vty, "Interface %s not enabled%s", ifp->name, VTYNL);
+      vty_out (vty, "Interface %s not enabled\n", ifp->name);
       return CMD_SUCCESS;
     }
 
   /* parse Area-ID */
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Invalid Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "Invalid Area-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
   /* Verify Area */
   if (oi->area == NULL)
     {
-      vty_out (vty, "No such Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "No such Area-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
   if (oi->area->area_id != area_id)
     {
-      vty_out (vty, "Wrong Area-ID: %s is attached to area %s%s",
-               oi->interface->name, oi->area->name, VTYNL);
+      vty_out (vty, "Wrong Area-ID: %s is attached to area %s\n",
+               oi->interface->name, oi->area->name);
       return CMD_SUCCESS;
     }
 
@@ -799,14 +799,14 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
 
   /* process id, router id */
   inet_ntop (AF_INET, &o->router_id, router_id, sizeof (router_id));
-  vty_out (vty, " OSPFv3 Routing Process (0) with Router-ID %s%s",
-           router_id, VTYNL);
+  vty_out (vty, " OSPFv3 Routing Process (0) with Router-ID %s\n",
+           router_id);
 
   /* running time */
   monotime(&now);
   timersub (&now, &o->starttime, &running);
   timerstring (&running, duration, sizeof (duration));
-  vty_out (vty, " Running %s%s", duration, VTYNL);
+  vty_out (vty, " Running %s\n", duration);
 
   /* Redistribute configuration */
   /* XXX */
@@ -829,27 +829,27 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
       timersub(&now, &o->ts_spf, &result);
       timerstring(&result, buf, sizeof(buf));
       ospf6_spf_reason_string(o->last_spf_reason, rbuf, sizeof(rbuf));
-      vty_out(vty, "last executed %s ago, reason %s%s", buf, rbuf, VTYNL);
-      vty_out (vty, " Last SPF duration %lld sec %lld usec%s",
+      vty_out(vty, "last executed %s ago, reason %s\n", buf, rbuf);
+      vty_out (vty, " Last SPF duration %lld sec %lld usec\n",
                (long long)o->ts_spf_duration.tv_sec,
-               (long long)o->ts_spf_duration.tv_usec, VTYNL);
+               (long long)o->ts_spf_duration.tv_usec);
     }
   else
     vty_out(vty, "has not been run$\n");
   threadtimer_string(now, o->t_spf_calc, buf, sizeof(buf));
-  vty_out (vty, " SPF timer %s%s%s",
-	   (o->t_spf_calc ? "due in " : "is "), buf, VTYNL);
+  vty_out (vty, " SPF timer %s%s\n",
+	   (o->t_spf_calc ? "due in " : "is "), buf);
 
   if (CHECK_FLAG (o->flag, OSPF6_STUB_ROUTER))
     vty_out (vty, " Router Is Stub Router\n");
 
   /* LSAs */
-  vty_out (vty, " Number of AS scoped LSAs is %u%s",
-           o->lsdb->count, VTYNL);
+  vty_out (vty, " Number of AS scoped LSAs is %u\n",
+           o->lsdb->count);
 
   /* Areas */
-  vty_out (vty, " Number of areas in this router is %u%s",
-           listcount (o->area_list), VTYNL);
+  vty_out (vty, " Number of areas in this router is %u\n",
+           listcount (o->area_list));
 
   if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
     {
@@ -1021,7 +1021,7 @@ config_write_ospf6 (struct vty *vty)
   inet_ntop (AF_INET, &ospf6->router_id_static, router_id, sizeof (router_id));
   vty_out (vty, "router ospf6\n");
   if (ospf6->router_id_static != 0)
-    vty_out (vty, " router-id %s%s", router_id, VTYNL);
+    vty_out (vty, " router-id %s\n", router_id);
 
   /* log-adjacency-changes flag print. */
   if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))
@@ -1037,8 +1037,7 @@ config_write_ospf6 (struct vty *vty)
     }
 
   if (ospf6->ref_bandwidth != OSPF6_REFERENCE_BANDWIDTH)
-    vty_out (vty, " auto-cost reference-bandwidth %d%s", ospf6->ref_bandwidth,
-             VTYNL);
+    vty_out (vty, " auto-cost reference-bandwidth %d\n", ospf6->ref_bandwidth);
 
   /* LSA timers print. */
   if (ospf6->lsa_minarrival != OSPF_MIN_LS_ARRIVAL)
@@ -1053,8 +1052,8 @@ config_write_ospf6 (struct vty *vty)
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, j, oa))
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, k, oi))
-        vty_out (vty, " interface %s area %s%s",
-                 oi->interface->name, oa->name, VTYNL);
+        vty_out (vty, " interface %s area %s\n",
+                 oi->interface->name, oa->name);
     }
   vty_out (vty, "!\n");
   return 0;
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 3ca9182f0..b609b4bb2 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -320,11 +320,10 @@ DEFUN (show_zebra,
     }
 
   vty_out (vty, "Zebra Infomation\n");
-  vty_out (vty, "  enable: %d fail: %d%s",
-           zclient->enable, zclient->fail, VTYNL);
-  vty_out (vty, "  redistribute default: %d%s",
-           vrf_bitmap_check (zclient->default_information, VRF_DEFAULT),
-           VTYNL);
+  vty_out (vty, "  enable: %d fail: %d\n",
+           zclient->enable, zclient->fail);
+  vty_out (vty, "  redistribute default: %d\n",
+           vrf_bitmap_check (zclient->default_information, VRF_DEFAULT));
   vty_out (vty, "  redistribute:");
   for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
     {
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index bee7828a9..13fb0ae3c 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -83,8 +83,8 @@ DEFUN (show_version_ospf6,
        "Display ospf6d version\n"
       )
 {
-  vty_out (vty, "Zebra OSPF6d Version: %s%s",
-           ospf6_daemon_version, VTYNL);
+  vty_out (vty, "Zebra OSPF6d Version: %s\n",
+           ospf6_daemon_version);
 
   return CMD_SUCCESS;
 }
@@ -1115,7 +1115,7 @@ DEFUN (show_ipv6_ospf6_border_routers,
           ro = ospf6_route_lookup (&prefix, ospf6->brouter_table);
           if (!ro)
             {
-              vty_out (vty, "No Route found for Router ID: %s%s", argv[4]->arg, VTYNL);
+              vty_out (vty, "No Route found for Router ID: %s\n", argv[4]->arg);
               return CMD_SUCCESS;
             }
 
@@ -1157,7 +1157,7 @@ DEFUN (show_ipv6_ospf6_linkstate,
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
-      vty_out (vty, "\n        SPF Result in Area %s%s%s", oa->name, VTYNL, VTYNL);
+      vty_out (vty, "\n        SPF Result in Area %s\n\n", oa->name);
       ospf6_linkstate_table_show (vty, idx_ipv4, argc, argv, oa->spf_table);
     }
 
@@ -1184,7 +1184,7 @@ DEFUN (show_ipv6_ospf6_linkstate_detail,
 
   for (ALL_LIST_ELEMENTS_RO (ospf6->area_list, node, oa))
     {
-      vty_out (vty, "\n        SPF Result in Area %s%s%s", oa->name, VTYNL, VTYNL);
+      vty_out (vty, "\n        SPF Result in Area %s\n\n", oa->name);
       ospf6_linkstate_table_show (vty, idx_detail, argc, argv, oa->spf_table);
     }