*: remove VTYNL, part 6 of 6

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

diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index 2635ffeb59de06a5d36b18c91e52dd64e1398a7a..380b0475775d1d1d334931b4606e39f9c88355a9 100644 (file)
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -2500,19 +2500,18 @@ rfapiRibShowResponses (
                 {
                   ++printedheader;
 
-                  fp (out, "%s[%s]\n",
-                      VTYNL,
+                  fp (out, "\n[%s]\n",
                       show_removed ? "Removed" : "Active");
                   fp (out, "%-15s %-15s\n", "Querying VN", "Querying UN");
-                  fp (out, "   %-20s %-15s %-15s %4s %-8s %-8s%s",
+                  fp (out, "   %-20s %-15s %-15s %4s %-8s %-8s\n",
                       "Prefix", "Registered VN", "Registered UN", "Cost",
                       "Lifetime",
 #if RFAPI_REGISTRATIONS_REPORT_AGE
-                      "Age",
+                      "Age"
 #else
-                      "Remaining",
+                      "Remaining"
 #endif
-                      VTYNL);
+                      );
                 }
               if (!printednve)
                 {

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 06df51644caa073dbd61f7998a9972249f4a5bf9..1b55fbbda9e2dc121a3a362d27fe9b14b0e4aecb 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -385,14 +385,14 @@ rfapiStdioPrintf (void *stream, const char *format, ...)
 /* Fake out for debug logging */
 static struct vty vty_dummy_zlog;
 static struct vty vty_dummy_stdio;
-#define HVTYNL ((vty == &vty_dummy_zlog)? "": VTYNL)
+#define HVTYNL ((vty == &vty_dummy_zlog)? "": "\n")
 
 static const char *
 str_vty_newline (struct vty *vty)
 {
   if (vty == &vty_dummy_zlog)
     return "";
-  return VTYNL;
+  return "\n";
 }
 
 int

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index 75c49fb4b2be52a48d67d0821f4c72e03c913c9d..9e18c0dca26f9ff6311cf44de747121b6e9d2a77 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -210,11 +210,11 @@ void
 show_ip_eigrp_interface_header (struct vty *vty, struct eigrp *eigrp)
 {
 
-  vty_out (vty, "\n%s%d%s%s%s %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s%s %-39s %-12s %-7s %-14s %-12s %-8s\n",
-           "EIGRP interfaces for AS(",eigrp->AS,")",VTYNL,VTYNL,
+  vty_out (vty, "\nEIGRP interfaces for AS(%d)\n\n %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s\n %-39s %-12s %-7s %-14s %-12s %-8s\n",
+           eigrp->AS,
            "Interface", "Bandwidth", "Delay", "Peers", "Xmit Queue", "Mean",
            "Pacing Time", "Multicast", "Pending", "Hello", "Holdtime",
-           VTYNL,"","Un/Reliable","SRTT","Un/Reliable","Flow Timer",
+           "","Un/Reliable","SRTT","Un/Reliable","Flow Timer",
            "Routes");
 }
 
@@ -256,11 +256,11 @@ show_ip_eigrp_interface_detail (struct vty *vty, struct eigrp *eigrp,
 void
 show_ip_eigrp_neighbor_header (struct vty *vty, struct eigrp *eigrp)
 {
-  vty_out (vty, "\n%s%d%s%s%s%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s%s %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
-           "EIGRP neighbors for AS(",eigrp->AS,")",VTYNL,VTYNL,
+  vty_out (vty, "\nEIGRP neighbors for AS(%d)\n\n%-3s %-17s %-20s %-6s %-8s %-6s %-5s %-5s %-5s\n %-41s %-6s %-8s %-6s %-4s %-6s %-5s \n",
+           eigrp->AS,
            "H", "Address", "Interface", "Hold", "Uptime",
-           "SRTT", "RTO", "Q", "Seq", VTYNL
-           ,"","(sec)","","(ms)","","Cnt","Num");
+           "SRTT", "RTO", "Q", "Seq",
+           "","(sec)","","(ms)","","Cnt","Num");
 }
 
 void
@@ -298,8 +298,7 @@ show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp)
 
   vty_out (vty, "\nEIGRP Topology Table for AS(%d)/ID(%s)\n\n", eigrp->AS, inet_ntoa(router_id));
   vty_out (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
-           "R - Reply%s       r - reply Status, s - sia Status%s\n",
-           VTYNL, VTYNL);
+           "R - Reply\n       r - reply Status, s - sia Status\n\n");
 }
 
 void

diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index ed87e213879e6b5d45ffb1e558df994012b01334..bec1375bd2a0bf8ff560f8821d14d62fbdc0b272 100644 (file)
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -232,23 +232,23 @@ show_discovery_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
        size_t   buflen = strlen(buffer);
 
        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-           "      LSR Id: %s:0%s", inet_ntoa(adj->id), VTYNL);
+           "      LSR Id: %s:0\n", inet_ntoa(adj->id));
        buflen = strlen(buffer);
        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-           "          Source address: %s%s",
-           log_addr(adj->af, &adj->src_addr), VTYNL);
+           "          Source address: %s\n",
+           log_addr(adj->af, &adj->src_addr));
        buflen = strlen(buffer);
        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-           "          Transport address: %s%s",
-           log_addr(adj->af, &adj->trans_addr), VTYNL);
+           "          Transport address: %s\n",
+           log_addr(adj->af, &adj->trans_addr));
        buflen = strlen(buffer);
        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-           "          Hello hold time: %u secs (due in %u secs)%s",
-           adj->holdtime, adj->holdtime_remaining, VTYNL);
+           "          Hello hold time: %u secs (due in %u secs)\n",
+           adj->holdtime, adj->holdtime_remaining);
        buflen = strlen(buffer);
        snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-           "          Dual-stack capability TLV: %s%s",
-           (adj->ds_tlv) ? "yes" : "no", VTYNL);
+           "          Dual-stack capability TLV: %s\n",
+           (adj->ds_tlv) ? "yes" : "no");
 }
 
 static int
@@ -279,8 +279,8 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
 
                buflen = strlen(ifaces_buffer);
                snprintf(ifaces_buffer + buflen, LDPBUFSIZ - buflen,
-                    "    %s: %s%s", iface->name, (iface->no_adj) ?
-                   "(no adjacencies)" : "", VTYNL);
+                    "    %s: %s\n", iface->name, (iface->no_adj) ?
+                   "(no adjacencies)" : "");
                break;
        case IMSG_CTL_SHOW_DISC_TNBR:
                tnbr = imsg->data;
@@ -292,9 +292,9 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg,
                    tnbr->af))->trans_addr;
                buflen = strlen(tnbrs_buffer);
                snprintf(tnbrs_buffer + buflen, LDPBUFSIZ - buflen,
-                   "    %s -> %s: %s%s", log_addr(tnbr->af, trans_addr),
+                   "    %s -> %s: %s\n", log_addr(tnbr->af, trans_addr),
                    log_addr(tnbr->af, &tnbr->addr), (tnbr->no_adj) ?
-                   "(no adjacencies)" : "", VTYNL);
+                   "(no adjacencies)" : "");
                break;
        case IMSG_CTL_SHOW_DISC_ADJ:
                adj = imsg->data;
@@ -531,12 +531,12 @@ show_nbr_detail_adj(struct vty *vty, char *buffer, struct ctl_adj *adj)
        switch (adj->type) {
        case HELLO_LINK:
                snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-                   "      Interface: %s%s", adj->ifname, VTYNL);
+                   "      Interface: %s\n", adj->ifname);
                break;
        case HELLO_TARGETED:
                snprintf(buffer + buflen, LDPBUFSIZ - buflen,
-                   "      Targeted Hello: %s%s", log_addr(adj->af,
-                   &adj->src_addr), VTYNL);
+                   "      Targeted Hello: %s\n", log_addr(adj->af,
+                   &adj->src_addr));
                break;
        }
 }
@@ -869,11 +869,10 @@ show_nbr_detail_msg_json(struct imsg *imsg, struct show_params *params,
 void
 show_nbr_capabilities(struct vty *vty, struct ctl_nbr *nbr)
 {
-       vty_out (vty, "  Capabilities Sent:%s"
-           "   - Dynamic Announcement (0x0506)%s"
-           "   - Typed Wildcard (0x050B)%s"
-           "   - Unrecognized Notification (0x0603)\n",
-           VTYNL, VTYNL, VTYNL);
+       vty_out (vty, "  Capabilities Sent:\n"
+           "   - Dynamic Announcement (0x0506)\n"
+           "   - Typed Wildcard (0x050B)\n"
+           "   - Unrecognized Notification (0x0603)\n");
        vty_out (vty, "  Capabilities Received:\n");
        if (nbr->flags & F_NBR_CAP_DYNAMIC)
                vty_out (vty,"   - Dynamic Announcement (0x0506)\n");
@@ -1077,15 +1076,15 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para
                upstream = 1;
                buflen = strlen(sent_buffer);
                snprintf(sent_buffer + buflen, LDPBUFSIZ - buflen,
-                   "%12s%s:0%s", "", inet_ntoa(rt->nexthop), VTYNL);
+                   "%12s%s:0\n", "", inet_ntoa(rt->nexthop));
                break;
        case IMSG_CTL_SHOW_LIB_RCVD:
                downstream = 1;
                buflen = strlen(rcvd_buffer);
                snprintf(rcvd_buffer + buflen, LDPBUFSIZ - buflen,
-                   "%12s%s:0, label %s%s%s", "", inet_ntoa(rt->nexthop),
+                   "%12s%s:0, label %s%s\n", "", inet_ntoa(rt->nexthop),
                    log_label(rt->remote_label),
-                   rt->in_use ? " (in use)" : "", VTYNL);
+                   rt->in_use ? " (in use)" : "");
                break;
        case IMSG_CTL_SHOW_LIB_END:
                if (upstream) {
@@ -1695,11 +1694,10 @@ ldp_vty_show_capabilities(struct vty *vty, int json)
        }
 
        vty_out (vty,
-           "Supported LDP Capabilities%s"
-           " * Dynamic Announcement (0x0506)%s"
-           " * Typed Wildcard (0x050B)%s"
-           " * Unrecognized Notification (0x0603)%s\n", VTYNL,
-           VTYNL, VTYNL, VTYNL);
+           "Supported LDP Capabilities\n"
+           " * Dynamic Announcement (0x0506)\n"
+           " * Typed Wildcard (0x050B)\n"
+           " * Unrecognized Notification (0x0603)\n\n");
 
        return (0);
 }

diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index edf55fba9980ceb9f19cad8e5cd96187f503a20a..f6bc3e772c886537fa1a1de97c4da8c0bbcd9ca7 100644 (file)
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -414,9 +414,9 @@ DEFUN (grammar_findambig,
         if (same)
           {
             vty_out (vty, "'%s' AMBIGUOUS:\n", cur->cmd);
-            vty_out (vty, "  %s%s   '%s'\n", prev->el->name, VTYNL,
+            vty_out (vty, "  %s\n   '%s'\n", prev->el->name,
                        prev->el->string);
-            vty_out (vty, "  %s%s   '%s'\n", cur->el->name,  VTYNL,
+            vty_out (vty, "  %s\n   '%s'\n", cur->el->name,
                        cur->el->string);
             vty_out (vty, "\n");
             ambig++;

diff --git a/lib/hash.c b/lib/hash.c
index 71f200d8513c7844e201547e1ee8ae7d857ad274..166bc7a260f86334d6e16cf450e0a25b32cf6e40 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -467,7 +467,7 @@ DEFUN(show_hash_stats,
   if (tt->nrows > 1)
     {
       ttable_colseps (tt, 0, RIGHT, true, '|');
-      char *table = ttable_dump (tt, VTYNL);
+      char *table = ttable_dump (tt, "\n");
       vty_out (vty, "%s\n", table);
       XFREE (MTYPE_TMP, table);
     }

diff --git a/lib/route_types.pl b/lib/route_types.pl
index 29bcd3a672538491e2f7a15c5b0ae768f2f58a47..9d50acaaeda8bb9c9e9e6a0a85cd00680e73d605 100755 (executable)
--- a/lib/route_types.pl
+++ b/lib/route_types.pl
@@ -113,19 +113,15 @@ sub codelist {
                        $protodetail{$p}->{"shorthelp"});
                if (length($str . $s) > 70) {
                        $str =~ s/ $//;
-                       push @lines, $str . "%s\" \\\n";
+                       push @lines, $str . "\\n\" \\\n";
                        $str = "  \"       ";
                }
                $str .= $s;
        }
        $str =~ s/ $//;
-       push @lines, $str . "%s\" \\\n";
-       push @lines, "  \"       > - selected route, * - FIB route%s%s\", \\\n";
-       my @nl = ();
-       for (my $c = 0; $c < @lines + 1; $c++) {
-               push @nl, "VTYNL"
-       }
-       return join("", @lines) ."  ". join(", ", @nl);
+       push @lines, $str . "\\n\" \\\n";
+       push @lines, "  \"       > - selected route, * - FIB route\\n\\n\"";
+       return join("", @lines);
 }
 
 print "\n";

diff --git a/lib/thread.c b/lib/thread.c
index df524d4aede563fc015de8c1e0933934a1d366a0..710ecc2a09d08131a84b6cd7035ecbffaa410ca9 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -163,12 +163,12 @@ cpu_record_print(struct vty *vty, thread_type filter)
       else
         vty_out(vty, "No data to display yet.\n");
 
-      vty_out(vty, VTYNL);
+      vty_out(vty, "\n");
     }
   }
   pthread_mutex_unlock (&masters_mtx);
 
-  vty_out(vty, VTYNL);
+  vty_out(vty, "\n");
   vty_out(vty, "Total thread statistics\n");
   vty_out(vty, "-------------------------\n");
   vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):");

diff --git a/lib/vrf.c b/lib/vrf.c
index 585341a40dbff3e07e05e98b9b70536fafdc4f97..03214736c285412a8a86aed731e12c295392918d 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -474,8 +474,8 @@ DEFUN_NOSH (vrf,
   if (strlen(vrfname) > VRF_NAMSIZ)
     {
       vty_out (vty, "%% VRF name %s is invalid: length exceeds "
-                    "%d characters%s",
-               vrfname, VRF_NAMSIZ, VTYNL);
+                    "%d characters\n",
+               vrfname, VRF_NAMSIZ);
       return CMD_WARNING;
     }
 

diff --git a/lib/vty.h b/lib/vty.h
index 27deaea3ef41efbe8f9cc59baa3beb94eda19510..66450065f248f9eee6a0b91b76bbefe3c0111566 100644 (file)
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -156,7 +156,7 @@ static inline void vty_push_context(struct vty *vty,
 #define VTY_CHECK_CONTEXT(ptr) \
        if (!ptr) { \
                vty_out (vty, "Current configuration object was deleted " \
-                               "by another process.%s", VTYNL); \
+                               "by another process.\n"); \
                return CMD_WARNING; \
        }
 
@@ -198,7 +198,7 @@ struct vty_arg
 #define VNL                                       "\n" \
        CPP_WARN("VNL has been replaced with \\n.")
 #define VTYNL                                     "\n" \
-/*     CPP_WARN("VTYNL has been replaced with \\n.") */
+       CPP_WARN("VTYNL has been replaced with \\n.")
 #define VTY_NEWLINE                               "\n" \
        CPP_WARN("VTY_NEWLINE has been replaced with \\n.")
 #define VTY_GET_INTEGER(desc,v,str)               {(v)=strtoul ((str), NULL, 10);} \

diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index 01300cb5cb8441bfca90671e229ab39abe6783f0..2c680d1082971a9bf2ee680a8b8119a1f18c6c40 100644 (file)
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -678,14 +678,12 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)
                return;
 
        vty_out(ctx->vty,
-                 "Type: %s%s"
-                 "Flags:%s%s%s"
+                 "Type: %s\n"
+                 "Flags:%s%s\n"
                  "Protocol-Address: %s/%zu\n",
                  nhrp_cache_type_str[c->cur.type],
-                 VTYNL,
                  (c->cur.peer && c->cur.peer->online) ? " up": "",
                  c->used ? " used": "",
-                 VTYNL,
                  sockunion2str(&c->remote_addr, buf, sizeof buf),
                  8 * family2addrsize(sockunion_family(&c->remote_addr)));
 

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 795c7f5ffa85cfeafdcbf227b721e41af4c6d6de..038ac53d6fdd7d3ba93b4b09753fe77418635e66 100644 (file)
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -1269,8 +1269,8 @@ ospf6_as_external_lsa_show (struct vty *vty, struct ospf6_lsa *lsa)
   /* Tag */
   if (CHECK_FLAG (external->bits_metric, OSPF6_ASBR_BIT_T))
     {
-      vty_out (vty, "     Tag: %"ROUTE_TAG_PRI"%s",
-               ospf6_as_external_lsa_get_tag (lsa), VTYNL);
+      vty_out (vty, "     Tag: %"ROUTE_TAG_PRI"\n",
+               ospf6_as_external_lsa_get_tag (lsa));
     }
 
   return 0;

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 6acaf35e985114d47b0c45922bdc38a93113d82c..9e0b86b7ba5143ef1d643e315ba826e66b52ae98 100644 (file)
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -814,14 +814,14 @@ ospf6_show (struct vty *vty, struct ospf6 *o)
   vty_out (vty, " LSA minimum arrival %d msecs\n",o->lsa_minarrival);
 
   /* Show SPF parameters */
-  vty_out(vty, " Initial SPF scheduling delay %d millisec(s)%s"
-         " Minimum hold time between consecutive SPFs %d millsecond(s)%s"
-         " Maximum hold time between consecutive SPFs %d millsecond(s)%s"
-         " Hold time multiplier is currently %d%s",
-         o->spf_delay, VTYNL,
-         o->spf_holdtime, VTYNL,
-         o->spf_max_holdtime, VTYNL,
-         o->spf_hold_multiplier, VTYNL);
+  vty_out(vty, " Initial SPF scheduling delay %d millisec(s)\n"
+         " Minimum hold time between consecutive SPFs %d millsecond(s)\n"
+         " Maximum hold time between consecutive SPFs %d millsecond(s)\n"
+         " Hold time multiplier is currently %d\n",
+         o->spf_delay,
+         o->spf_holdtime,
+         o->spf_max_holdtime,
+         o->spf_hold_multiplier);
 
   vty_out(vty, " SPF algorithm ");
   if (o->ts_spf.tv_sec || o->ts_spf.tv_usec)

diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 13fb0ae3cad4e6c4602877df44a1c93d523c1c84..c4a49903170b4552da8d962d6303874db52339ac 100644 (file)
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -115,11 +115,11 @@ config_write_ospf6_debug (struct vty *vty)
 }
 
 #define AREA_LSDB_TITLE_FORMAT \
-  "%s        Area Scoped Link State Database (Area %s)%s%s"
+  "\n        Area Scoped Link State Database (Area %s)\n\n"
 #define IF_LSDB_TITLE_FORMAT \
-  "%s        I/F Scoped Link State Database (I/F %s in Area %s)%s%s"
+  "\n        I/F Scoped Link State Database (I/F %s in Area %s)\n\n"
 #define AS_LSDB_TITLE_FORMAT \
-  "%s        AS Scoped Link State Database%s%s"
+  "\n        AS Scoped Link State Database\n\n"
 
 static int
 parse_show_level (int idx_level, int argc, struct cmd_token **argv)
@@ -189,7 +189,7 @@ DEFUN (show_ipv6_ospf6_database,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oa->lsdb);
     }
 
@@ -197,13 +197,13 @@ DEFUN (show_ipv6_ospf6_database,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, NULL, NULL, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, NULL, NULL, o->lsdb);
 
   vty_out (vty, "\n");
@@ -250,7 +250,7 @@ DEFUN (show_ipv6_ospf6_database_type,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, NULL, NULL, oa->lsdb);
           }
         break;
@@ -260,15 +260,15 @@ DEFUN (show_ipv6_ospf6_database_type,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, NULL, NULL, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, NULL, NULL, o->lsdb);
         break;
 
@@ -313,7 +313,7 @@ DEFUN (show_ipv6_ospf6_database_id,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, &id, NULL, oa->lsdb);
     }
 
@@ -321,13 +321,13 @@ DEFUN (show_ipv6_ospf6_database_id,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, &id, NULL, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, &id, NULL, o->lsdb);
 
   vty_out (vty, "\n");
@@ -364,7 +364,7 @@ DEFUN (show_ipv6_ospf6_database_router,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
     }
 
@@ -372,13 +372,13 @@ DEFUN (show_ipv6_ospf6_database_router,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
 
   vty_out (vty, "\n");
@@ -430,7 +430,7 @@ DEFUN (show_ipv6_ospf6_database_type_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, &id, NULL, oa->lsdb);
           }
         break;
@@ -440,15 +440,15 @@ DEFUN (show_ipv6_ospf6_database_type_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, &id, NULL, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, &id, NULL, o->lsdb);
         break;
 
@@ -507,7 +507,7 @@ DEFUN (show_ipv6_ospf6_database_type_router,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
           }
         break;
@@ -517,15 +517,15 @@ DEFUN (show_ipv6_ospf6_database_type_router,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
         break;
 
@@ -572,7 +572,7 @@ DEFUN (show_ipv6_ospf6_database_id_router,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
     }
 
@@ -580,13 +580,13 @@ DEFUN (show_ipv6_ospf6_database_id_router,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
 
   vty_out (vty, "\n");
@@ -627,7 +627,7 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oa->lsdb);
     }
 
@@ -635,13 +635,13 @@ DEFUN (show_ipv6_ospf6_database_adv_router_linkstate_id,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, &id, &adv_router, o->lsdb);
 
   vty_out (vty, "\n");
@@ -694,7 +694,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -704,15 +704,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_router,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -774,7 +774,7 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -784,15 +784,15 @@ DEFUN (show_ipv6_ospf6_database_type_adv_router_linkstate_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -831,7 +831,7 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
 
   for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
     {
-      vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+      vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
       ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oa->lsdb);
     }
 
@@ -839,13 +839,13 @@ DEFUN (show_ipv6_ospf6_database_self_originated,
     {
       for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
         {
-          vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                   oi->interface->name, oa->name, VTYNL, VTYNL);
+          vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                   oi->interface->name, oa->name);
           ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, oi->lsdb);
         }
     }
 
-  vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+  vty_out (vty, AS_LSDB_TITLE_FORMAT);
   ospf6_lsdb_show (vty, level, NULL, NULL, &adv_router, o->lsdb);
 
   vty_out (vty, "\n");
@@ -896,7 +896,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oa->lsdb);
           }
         break;
@@ -906,15 +906,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, NULL, &adv_router, o->lsdb);
         break;
 
@@ -974,7 +974,7 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -984,15 +984,15 @@ DEFUN (show_ipv6_ospf6_database_type_self_originated_linkstate_id,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 
@@ -1051,7 +1051,7 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
       case OSPF6_SCOPE_AREA:
         for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
           {
-            vty_out (vty, AREA_LSDB_TITLE_FORMAT, VTYNL, oa->name, VTYNL, VTYNL);
+            vty_out (vty, AREA_LSDB_TITLE_FORMAT, oa->name);
             ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oa->lsdb);
           }
         break;
@@ -1061,15 +1061,15 @@ DEFUN (show_ipv6_ospf6_database_type_id_self_originated,
           {
             for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
               {
-                vty_out (vty, IF_LSDB_TITLE_FORMAT, VTYNL,
-                         oi->interface->name, oa->name, VTYNL, VTYNL);
+                vty_out (vty, IF_LSDB_TITLE_FORMAT,
+                         oi->interface->name, oa->name);
                 ospf6_lsdb_show (vty, level, &type, &id, &adv_router, oi->lsdb);
               }
           }
         break;
 
       case OSPF6_SCOPE_AS:
-        vty_out (vty, AS_LSDB_TITLE_FORMAT, VTYNL, VTYNL, VTYNL);
+        vty_out (vty, AS_LSDB_TITLE_FORMAT);
         ospf6_lsdb_show (vty, level, &type, &id, &adv_router, o->lsdb);
         break;
 

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 98d36bb504ee6e830cbb827e60ccab7c33175e2e..89fd7971f0341d59d590b8c1d28475f3cbfe161c 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -223,7 +223,7 @@ DEFUN (ospf_router_id,
     if (area->full_nbrs)
       {
         vty_out (vty, "For this router-id change to take effect,"
-                 " save config and restart ospfd%s", VTYNL);
+                 " save config and restart ospfd\n");
         return CMD_SUCCESS;
       }
 
@@ -258,7 +258,7 @@ DEFUN_HIDDEN (ospf_router_id_old,
     if (area->full_nbrs)
       {
         vty_out (vty, "For this router-id change to take effect,"
-                 " save config and restart ospfd%s", VTYNL);
+                 " save config and restart ospfd\n");
         return CMD_SUCCESS;
       }
 
@@ -285,7 +285,7 @@ DEFUN (no_ospf_router_id,
     if (area->full_nbrs)
       {
         vty_out (vty, "For this router-id change to take effect,"
-                 " save config and restart ospfd%s", VTYNL);
+                 " save config and restart ospfd\n");
         return CMD_SUCCESS;
       }
 
@@ -1356,8 +1356,7 @@ DEFUN (ospf_area_shortcut,
 
   if (ospf->abr_type != OSPF_ABR_SHORTCUT)
     vty_out (vty, "Shortcut area setting will take effect "
-            "only when the router is configured as Shortcut ABR%s",
-            VTYNL);
+            "only when the router is configured as Shortcut ABR\n");
 
   return CMD_SUCCESS;
 }
@@ -2716,8 +2715,8 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
     }
   else
     vty_out (vty, "   Number of interfaces in this area: Total: %d, "
-             "Active: %d%s", listcount (area->oiflist),
-             area->act_ints, VTYNL);
+             "Active: %d\n", listcount (area->oiflist),
+             area->act_ints);
 
   if (area->external_routing == OSPF_AREA_NSSA)
     {
@@ -2830,7 +2829,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
     {
       /* Show number of fully adjacent neighbors. */
       vty_out (vty, "   Number of fully adjacent neighbors in this area:"
-               " %d%s", area->full_nbrs, VTYNL);
+               " %d\n", area->full_nbrs);
 
       /* Show authentication type. */
       vty_out (vty, "   Area has ");
@@ -2843,7 +2842,7 @@ show_ip_ospf_area (struct vty *vty, struct ospf_area *area, json_object *json_ar
 
       if (!OSPF_IS_AREA_BACKBONE (area))
         vty_out (vty, "   Number of full virtual adjacencies going through"
-                 " this area: %d%s", area->full_vls, VTYNL);
+                 " this area: %d\n", area->full_vls);
 
       /* Show SPF calculation times. */
       vty_out (vty, "   SPF algorithm executed %d times\n",
@@ -3013,14 +3012,14 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
     }
   else
     {
-      vty_out (vty, " Initial SPF scheduling delay %d millisec(s)%s"
-                    " Minimum hold time between consecutive SPFs %d millisec(s)%s"
-                    " Maximum hold time between consecutive SPFs %d millisec(s)%s"
-                    " Hold time multiplier is currently %d%s",
-               ospf->spf_delay, VTYNL,
-               ospf->spf_holdtime, VTYNL,
-               ospf->spf_max_holdtime, VTYNL,
-               ospf->spf_hold_multiplier, VTYNL);
+      vty_out (vty, " Initial SPF scheduling delay %d millisec(s)\n"
+                    " Minimum hold time between consecutive SPFs %d millisec(s)\n"
+                    " Maximum hold time between consecutive SPFs %d millisec(s)\n"
+                    " Hold time multiplier is currently %d\n",
+               ospf->spf_delay,
+               ospf->spf_holdtime,
+               ospf->spf_max_holdtime,
+               ospf->spf_hold_multiplier);
     }
 
   if (use_json)
@@ -3104,7 +3103,7 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
         json_object_string_add(json, "asbrRouter", "injectingExternalRoutingInformation");
       else
         vty_out (vty, " This router is an ASBR "
-                 "(injecting external routing information)%s", VTYNL);
+                 "(injecting external routing information)\n");
     }
 
   /* Show Number of AS-external-LSAs. */
@@ -4909,8 +4908,8 @@ show_as_external_lsa_detail (struct vty *vty, struct ospf_lsa *lsa)
       vty_out (vty, "        Forward Address: %s\n",
               inet_ntoa (al->e[0].fwd_addr));
 
-      vty_out (vty, "        External Route Tag: %"ROUTE_TAG_PRI"%s%s",
-              (route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL);
+      vty_out (vty, "        External Route Tag: %"ROUTE_TAG_PRI"\n\n",
+              (route_tag_t)ntohl (al->e[0].route_tag));
     }
 
   return 0;
@@ -4961,8 +4960,8 @@ show_as_nssa_lsa_detail (struct vty *vty, struct ospf_lsa *lsa)
       vty_out (vty, "        NSSA: Forward Address: %s\n",
               inet_ntoa (al->e[0].fwd_addr));
 
-      vty_out (vty, "        External Route Tag: %"ROUTE_TAG_PRI"%s%s",
-              (route_tag_t)ntohl (al->e[0].route_tag), VTYNL, VTYNL);
+      vty_out (vty, "        External Route Tag: %"ROUTE_TAG_PRI"\n\n",
+              (route_tag_t)ntohl (al->e[0].route_tag));
     }
 
   return 0;
@@ -7906,12 +7905,12 @@ show_ip_ospf_route_external (struct vty *vty, struct route_table *rt)
        switch (er->path_type)
          {
          case OSPF_PATH_TYPE1_EXTERNAL:
-           vty_out (vty, "N E1 %-18s    [%d] tag: %"ROUTE_TAG_PRI"%s", buf1,
-                    er->cost, er->u.ext.tag, VTYNL);
+           vty_out (vty, "N E1 %-18s    [%d] tag: %"ROUTE_TAG_PRI"\n", buf1,
+                    er->cost, er->u.ext.tag);
            break;
          case OSPF_PATH_TYPE2_EXTERNAL:
-           vty_out (vty, "N E2 %-18s    [%d/%d] tag: %"ROUTE_TAG_PRI"%s", buf1, er->cost,
-                    er->u.ext.type2_cost, er->u.ext.tag, VTYNL);
+           vty_out (vty, "N E2 %-18s    [%d/%d] tag: %"ROUTE_TAG_PRI"\n", buf1, er->cost,
+                    er->u.ext.type2_cost, er->u.ext.tag);
            break;
          }
 
@@ -8502,10 +8501,10 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf)
          for (ALL_LIST_ELEMENTS_RO (IF_DEF_PARAMS (vl_data->vl_oi->ifp)->auth_crypt,
                                      n2, ck))
             vty_out (vty, " area %s virtual-link %s"
-                     " message-digest-key %d md5 %s%s",
+                     " message-digest-key %d md5 %s\n",
                      buf,
                      inet_ntoa (vl_data->vl_peer),
-                     ck->key_id, ck->auth_key, VTYNL);
+                     ck->key_id, ck->auth_key);
         
        }
     }
@@ -8694,7 +8693,7 @@ ospf_config_write (struct vty *vty)
       if (ospf->ref_bandwidth != OSPF_DEFAULT_REF_BANDWIDTH)
         {
           vty_out (vty, "! Important: ensure reference bandwidth "
-                        "is consistent across all routers%s", VTYNL);
+                        "is consistent across all routers\n");
           vty_out (vty, " auto-cost reference-bandwidth %d\n",
                   ospf->ref_bandwidth);
         }

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 4bc367e4080ade709ef7b9fdfa1b560a34912865..94f7d1534bbf91948b65b3893617c2e87df08972 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -221,11 +221,10 @@ static void pim_show_assert_internal(struct vty *vty)
   struct in_addr ifaddr;
 
   vty_out (vty,
-         "CA:   CouldAssert%s"
-         "ECA:  Evaluate CouldAssert%s"
-         "ATD:  AssertTrackingDesired%s"
-         "eATD: Evaluate AssertTrackingDesired%s\n",
-         VTYNL, VTYNL, VTYNL, VTYNL);
+         "CA:   CouldAssert\n"
+         "ECA:  Evaluate CouldAssert\n"
+         "ATD:  AssertTrackingDesired\n"
+         "eATD: Evaluate AssertTrackingDesired\n\n");
 
   vty_out (vty,
          "Interface Address         Source          Group           CA  eCA ATD eATD\n");
@@ -2149,19 +2148,19 @@ static void show_rpf_refresh_stats(struct vty *vty, time_t now, json_object *jso
     json_object_int_add(json, "nexthopLookupsAvoided", nexthop_lookups_avoided);
   } else {
     vty_out (vty,
-            "RPF Cache Refresh Delay:    %ld msecs%s"
-            "RPF Cache Refresh Timer:    %ld msecs%s"
-            "RPF Cache Refresh Requests: %lld%s"
-            "RPF Cache Refresh Events:   %lld%s"
-            "RPF Cache Refresh Last:     %s%s"
-            "Nexthop Lookups:            %lld%s"
+            "RPF Cache Refresh Delay:    %ld msecs\n"
+            "RPF Cache Refresh Timer:    %ld msecs\n"
+            "RPF Cache Refresh Requests: %lld\n"
+            "RPF Cache Refresh Events:   %lld\n"
+            "RPF Cache Refresh Last:     %s\n"
+            "Nexthop Lookups:            %lld\n"
            "Nexthop Lookups Avoided:    %lld\n",
-            qpim_rpf_cache_refresh_delay_msec, VTYNL,
-            pim_time_timer_remain_msec(qpim_rpf_cache_refresher), VTYNL,
-            (long long)qpim_rpf_cache_refresh_requests, VTYNL,
-            (long long)qpim_rpf_cache_refresh_events, VTYNL,
-            refresh_uptime, VTYNL,
-            (long long) qpim_nexthop_lookups, VTYNL,
+            qpim_rpf_cache_refresh_delay_msec,
+            pim_time_timer_remain_msec(qpim_rpf_cache_refresher),
+            (long long)qpim_rpf_cache_refresh_requests,
+            (long long)qpim_rpf_cache_refresh_events,
+            refresh_uptime,
+            (long long) qpim_nexthop_lookups,
            (long long)nexthop_lookups_avoided);
   }
 }
@@ -2177,11 +2176,11 @@ static void show_scan_oil_stats(struct vty *vty, time_t now)
   pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now, qpim_mroute_del_last);
 
   vty_out (vty,
-          "Scan OIL - Last: %s  Events: %lld%s"
-          "MFC Add  - Last: %s  Events: %lld%s"
+          "Scan OIL - Last: %s  Events: %lld\n"
+          "MFC Add  - Last: %s  Events: %lld\n"
           "MFC Del  - Last: %s  Events: %lld\n",
-          uptime_scan_oil,   (long long) qpim_scan_oil_events,   VTYNL,
-          uptime_mroute_add, (long long) qpim_mroute_add_events, VTYNL,
+          uptime_scan_oil,   (long long) qpim_scan_oil_events,
+          uptime_mroute_add, (long long) qpim_mroute_add_events,
           uptime_mroute_del, (long long)qpim_mroute_del_events);
 }
 
@@ -3214,13 +3213,12 @@ static void show_multicast_interfaces(struct vty *vty)
     vreq.vifi = pim_ifp->mroute_vif_index;
 
     if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) {
-      zlog_warn("ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s%s",
+      zlog_warn("ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s\n",
                (unsigned long)SIOCGETVIFCNT,
                ifp->name,
                pim_ifp->mroute_vif_index,
                errno,
-               safe_strerror(errno),
-               VTYNL);
+               safe_strerror(errno));
     }
 
     ifaddr = pim_ifp->primary_address;

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 5bbab7e4cdb0437513fe542d5c45d21e87ce920e..c93d16647c9d2cce0ac23bd73c28765cf9f02114 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3474,12 +3474,11 @@ DEFUN (show_ip_rip,
   if (! rip)
     return CMD_SUCCESS;
 
-  vty_out (vty, "Codes: R - RIP, C - connected, S - Static, O - OSPF, B - BGP%s"
-          "Sub-codes:%s"
-           "      (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s"
-          "      (i) - interface%s%s"
-          "     Network            Next Hop         Metric From            Tag Time\n",
-          VTYNL, VTYNL,  VTYNL, VTYNL, VTYNL);
+  vty_out (vty, "Codes: R - RIP, C - connected, S - Static, O - OSPF, B - BGP\n"
+          "Sub-codes:\n"
+           "      (n) - normal, (s) - static, (d) - default, (r) - redistribute,\n"
+          "      (i) - interface\n\n"
+          "     Network            Next Hop         Metric From            Tag Time\n");
   
   for (np = route_top (rip->table); np; np = route_next (np))
     if ((list = np->info) != NULL)

diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c
index 03f3b4e05f340e1c6deb53412424b7cb42ec479f..f27c33f37c176dd4572673f90f3ab8ee60db5117 100644 (file)
--- a/ripngd/ripng_peer.c
+++ b/ripngd/ripng_peer.c
@@ -193,8 +193,8 @@ ripng_peer_display (struct vty *vty)
 
   for (ALL_LIST_ELEMENTS (peer_list, node, nnode, peer))
     {
-      vty_out (vty, "    %s %s%14s %10d %10d %10d      %s\n", inet6_ntoa (peer->addr),
-               VTYNL, " ",
+      vty_out (vty, "    %s \n%14s %10d %10d %10d      %s\n", inet6_ntoa (peer->addr),
+               " ",
               peer->recv_badpackets, peer->recv_badroutes,
               ZEBRA_RIPNG_DISTANCE_DEFAULT,
               ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN));

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index eb2d1a69301dd0366ea024720af740e02cabc42f..0b1faae03d6e9076058b1c128282ef6973ded0a8 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2004,13 +2004,11 @@ DEFUN (show_ipv6_ripng,
     return CMD_SUCCESS;
 
   /* Header of display. */ 
-  vty_out (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP%s"
-          "Sub-codes:%s"
-          "      (n) - normal, (s) - static, (d) - default, (r) - redistribute,%s"
-          "      (i) - interface, (a/S) - aggregated/Suppressed%s%s"
-          "   Network      Next Hop                      Via     Metric Tag Time\n",
-          VTYNL, VTYNL, VTYNL,
-          VTYNL, VTYNL);
+  vty_out (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP\n"
+          "Sub-codes:\n"
+          "      (n) - normal, (s) - static, (d) - default, (r) - redistribute,\n"
+          "      (i) - interface, (a/S) - aggregated/Suppressed\n\n"
+          "   Network      Next Hop                      Via     Metric Tag Time\n");
   
   for (rp = route_top (ripng->table); rp; rp = route_next (rp))
     {

diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c
index 382d1623f3e41c7cac7b30bf867fc9f536155b95..c6f6bbba2a531f364e96d163d9e74ea4698a99ae 100644 (file)
--- a/tests/lib/test_heavy.c
+++ b/tests/lib/test_heavy.c
@@ -63,7 +63,7 @@ slow_func (struct vty *vty, const char *str, const int i)
     printf ("%s: hard error\n", __func__);
   
   if ((i % ITERS_PRINT) == 0)
-    printf ("%s did %d, x = %g%s", str, i, x, VTYNL);  
+    printf ("%s did %d, x = %g\n", str, i, x);
 }
 
 static void