*: ditch vty_outln(), part 2 of 2

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

diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c
index 5d60f4193996ad248cda4a04d9817af69df7f149..831df9b68868690b5ecd86a2e0fbc7ae632bbd53 100644 (file)
--- a/babeld/babel_interface.c
+++ b/babeld/babel_interface.c
@@ -879,7 +879,7 @@ show_babel_interface_sub (struct vty *vty, struct interface *ifp)
   }
   babel_ifp = babel_get_if_nfo (ifp);
   vty_out (vty, "  Babel protocol is running on this interface\n");
-  vty_outln (vty, "  Operating mode is \"%s\"",
+  vty_out (vty, "  Operating mode is \"%s\"\n",
            CHECK_FLAG(babel_ifp->flags, BABEL_IF_WIRED) ? "wired" : "wireless");
   vty_out (vty, "  Split horizon mode is %s\n",
            CHECK_FLAG(babel_ifp->flags, BABEL_IF_SPLIT_HORIZON) ? "On" : "Off");
@@ -917,9 +917,9 @@ DEFUN (show_babel_interface,
 static void
 show_babel_neighbour_sub (struct vty *vty, struct neighbour *neigh)
 {
-    vty_outln (vty,
+    vty_out (vty,
              "Neighbour %s dev %s reach %04x rxcost %d txcost %d "
-             "rtt %s rttcost %d%s.",
+             "rtt %s rttcost %d%s.\n",
              format_address(neigh->address),
              neigh->ifp->name,
              neigh->reach,
@@ -1009,9 +1009,9 @@ show_babel_routes_sub(struct babel_route *route, struct vty *vty,
             channels[0] = '\0';
     }
 
-    vty_outln (vty,
+    vty_out (vty,
             "%s metric %d refmetric %d id %s seqno %d%s age %d "
-            "via %s neigh %s%s%s%s",
+            "via %s neigh %s%s%s%s\n",
             format_prefix(route->src->prefix, route->src->plen),
             route_metric(route), route->refmetric,
             format_eui64(route->src->id),

diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index eb2909b40e6cd6a61501dd58a4455f6e37c06f0e..725b2b432162bc77cde644bbe6b609d96e56262d 100644 (file)
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -377,7 +377,7 @@ babel_save_state_file(void)
 void
 show_babel_main_configuration (struct vty *vty)
 {
-    vty_outln (vty,
+    vty_out (vty,
             "state file              = %s%s"
             "configuration file      = %s%s"
             "protocol informations:%s"
@@ -386,7 +386,7 @@ show_babel_main_configuration (struct vty *vty)
             "vty address             = %s%s"
             "vty port                = %d%s"
             "id                      = %s%s"
-            "kernel_metric           = %d",
+            "kernel_metric           = %d\n",
             state_file, VTYNL,
             babel_config_file ? babel_config_file : babel_config_default,
             VTYNL,

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 7a8ef12c77c5a44cf7b0e3ce84e146753db800da..603171138e752dafd8aefe1b9867a2d095c7fd47 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -135,10 +135,10 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                                } else {
                                                        if (option ==
                                                            SHOW_DISPLAY_TAGS)
-                                                               vty_outln(vty, V4_HEADER_TAG);
+                                                               vty_out(vty, V4_HEADER_TAG);
                                                        else if (option ==
                                                                 SHOW_DISPLAY_OVERLAY)
-                                                               vty_outln(vty, V4_HEADER_OVERLAY);
+                                                               vty_out(vty, V4_HEADER_OVERLAY);
                                                        else {
                                                                vty_out (vty,
                                                                        "BGP table version is 0, local router ID is %s\n",
@@ -148,7 +148,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                                                vty_out (vty,
                                                                        "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
                                                                        VTYNL);
-                                                               vty_outln(vty, V4_HEADER);
+                                                               vty_out(vty, V4_HEADER);
                                                        }
                                                }
                                                header = 0;
@@ -224,7 +224,7 @@ bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
                                                                         ip),
                                                                        rd_ip.
                                                                        val);
-                                                       vty_outln (vty, VTYNL);
+                                                       vty_out (vty, "\n\n");
                                                }
                                                rd_header = 0;
                                        }

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 3efbeb8b49e55d4e1984b845e60c75882fb042ba..979ff6bfe5b61e09395c124b30525495aac6e88d 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -634,7 +634,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
                       else
                         {
                          if (tags)
-                           vty_outln (vty, V4_HEADER_TAG);
+                           vty_out (vty, V4_HEADER_TAG);
                          else
                            {
                              vty_out (vty, "BGP table version is 0, local router ID is %s\n",
@@ -643,7 +643,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
                                          "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
                              vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
                                       VTYNL);
-                             vty_outln (vty, V4_HEADER);
+                             vty_out (vty, V4_HEADER);
                            }
                         }
                      header = 0;

diff --git a/bgpd/bgp_mplsvpn.h b/bgpd/bgp_mplsvpn.h
index 4ba4597d069059bdb33ef2a9929e31b6c55ad216..98806abc36c4aba3fbf3265e78715bf4c4b7f060 100644 (file)
--- a/bgpd/bgp_mplsvpn.h
+++ b/bgpd/bgp_mplsvpn.h
@@ -68,11 +68,11 @@ typedef enum {
   "Address Family\n"
 
 #define V4_HEADER \
-  "   Network          Next Hop            Metric LocPrf Weight Path"
+  "   Network          Next Hop            Metric LocPrf Weight Path\n"
 #define V4_HEADER_TAG \
-  "   Network          Next Hop      In tag/Out tag"
+  "   Network          Next Hop      In tag/Out tag\n"
 #define V4_HEADER_OVERLAY \
-  "   Network          Next Hop      EthTag    Overlay Index   RouterMac"
+  "   Network          Next Hop      EthTag    Overlay Index   RouterMac\n"
 
 struct rd_as
 {

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 156c0aa3599baa8d75f092bf180aefab6e116e16..c7e26a0a67d0d53defcf849fb07e08d5983ed7f2 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7768,8 +7768,8 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
 }
 
 #define BGP_SHOW_HEADER_CSV "Flags, Network, Next Hop, Metric, LocPrf, Weight, Path"
-#define BGP_SHOW_DAMP_HEADER "   Network          From             Reuse    Path"
-#define BGP_SHOW_FLAP_HEADER "   Network          From            Flaps Duration Reuse    Path"
+#define BGP_SHOW_DAMP_HEADER "   Network          From             Reuse    Path\n"
+#define BGP_SHOW_FLAP_HEADER "   Network          From            Flaps Duration Reuse    Path\n"
 
 static int
 bgp_show_prefix_list (struct vty *vty, struct bgp *bgp,
@@ -7986,18 +7986,18 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table,
 
             if (!use_json && header)
               {
-                vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version,
+                vty_out (vty, "BGP table version is %" PRIu64 ", local router ID is %s\n", table->version,
                            inet_ntoa(bgp->router_id));
-                vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
-                vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
+                vty_out (vty, BGP_SHOW_SCODE_HEADER);
+                vty_out (vty, BGP_SHOW_OCODE_HEADER);
                 if (type == bgp_show_type_dampend_paths
                     || type == bgp_show_type_damp_neighbor)
-                  vty_outln (vty, BGP_SHOW_DAMP_HEADER);
+                  vty_out (vty, BGP_SHOW_DAMP_HEADER);
                 else if (type == bgp_show_type_flap_statistics
                          || type == bgp_show_type_flap_neighbor)
-                  vty_outln (vty, BGP_SHOW_FLAP_HEADER);
+                  vty_out (vty, BGP_SHOW_FLAP_HEADER);
                 else
-                  vty_outln (vty, BGP_SHOW_HEADER);
+                  vty_out (vty, BGP_SHOW_HEADER);
                 header = 0;
               }
 
@@ -9644,10 +9644,10 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
         }
       else
         {
-          vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version,
+          vty_out (vty, "BGP table version is %" PRIu64 ", local router ID is %s\n", table->version,
                      inet_ntoa(bgp->router_id));
-          vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
-          vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
+          vty_out (vty, BGP_SHOW_SCODE_HEADER);
+          vty_out (vty, BGP_SHOW_OCODE_HEADER);
 
           vty_out (vty, "Originating default network 0.0.0.0%s\n",
                    VTYNL);
@@ -9677,15 +9677,15 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
                         {
                           vty_out (vty, "BGP table version is 0, local router ID is %s\n",
                                      inet_ntoa(bgp->router_id));
-                          vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
-                          vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
+                          vty_out (vty, BGP_SHOW_SCODE_HEADER);
+                          vty_out (vty, BGP_SHOW_OCODE_HEADER);
                         }
                       header1 = 0;
                     }
                   if (header2)
                     {
                       if (!use_json)
-                        vty_outln (vty, BGP_SHOW_HEADER);
+                        vty_out (vty, BGP_SHOW_HEADER);
                       header2 = 0;
                     }
                   if (ain->attr)
@@ -9719,10 +9719,10 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
                         }
                       else
                         {
-                          vty_outln (vty, "BGP table version is %" PRIu64 ", local router ID is %s", table->version,
+                          vty_out (vty, "BGP table version is %" PRIu64 ", local router ID is %s\n", table->version,
                                    inet_ntoa(bgp->router_id));
-                          vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
-                          vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
+                          vty_out (vty, BGP_SHOW_SCODE_HEADER);
+                          vty_out (vty, BGP_SHOW_OCODE_HEADER);
                         }
                       header1 = 0;
                     }
@@ -9730,7 +9730,7 @@ show_adj_route (struct vty *vty, struct peer *peer, afi_t afi, safi_t safi,
                   if (header2)
                     {
                       if (!use_json)
-                        vty_outln (vty, BGP_SHOW_HEADER);
+                        vty_out (vty, BGP_SHOW_HEADER);
                       header2 = 0;
                     }
 

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 0c77cc1ee08b4a438eab2c710aadbc69555ec778..54a56456dc41ce5eb9b2823e286bb3d3304ea7a3 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -53,10 +53,10 @@ enum bgp_show_type
 
 
 #define BGP_SHOW_SCODE_HEADER "Status codes: s suppressed, d damped, "\
-                              "h history, * valid, > best, = multipath,%s"\
-                "              i internal, r RIB-failure, S Stale, R Removed"
-#define BGP_SHOW_OCODE_HEADER "Origin codes: i - IGP, e - EGP, ? - incomplete%s"
-#define BGP_SHOW_HEADER "   Network          Next Hop            Metric LocPrf Weight Path"
+                              "h history, * valid, > best, = multipath,\n"\
+                "              i internal, r RIB-failure, S Stale, R Removed\n"
+#define BGP_SHOW_OCODE_HEADER "Origin codes: i - IGP, e - EGP, ? - incomplete\n\n"
+#define BGP_SHOW_HEADER "   Network          Next Hop            Metric LocPrf Weight Path\n"
 
 /* Ancillary information to struct bgp_info, 
  * used for uncommonly used data (aggregation, MPLS, etc.)

diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index 78e5b86be5e640b324e70c7572e648c377281816..fac446a79b42493c4cd247c87b5a266cd708c441 100644 (file)
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -564,7 +564,7 @@ update_group_show_walkcb (struct update_group *updgrp, void *arg)
 
   vty = ctx->vty;
 
-  vty_outln (vty, "Update-group %" PRIu64 ":", updgrp->id);
+  vty_out (vty, "Update-group %" PRIu64 ":\n", updgrp->id);
   vty_out (vty, "  Created: %s", timestamp_string (updgrp->uptime));
   filter = &updgrp->conf->filter[updgrp->afi][updgrp->safi];
   if (filter->map[RMAP_OUT].name)
@@ -585,14 +585,14 @@ update_group_show_walkcb (struct update_group *updgrp, void *arg)
     if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id))
       continue;
     vty_out (vty, VTYNL);
-    vty_outln (vty, "  Update-subgroup %" PRIu64 ":", subgrp->id);
+    vty_out (vty, "  Update-subgroup %" PRIu64 ":\n", subgrp->id);
     vty_out (vty, "    Created: %s", timestamp_string (subgrp->uptime));
 
     if (subgrp->split_from.update_group_id || subgrp->split_from.subgroup_id)
       {
-       vty_outln (vty, "    Split from group id: %" PRIu64 "",
+       vty_out (vty, "    Split from group id: %" PRIu64 "\n",
                 subgrp->split_from.update_group_id);
-       vty_outln (vty, "    Split from subgroup id: %" PRIu64 "",
+       vty_out (vty, "    Split from subgroup id: %" PRIu64 "\n",
                 subgrp->split_from.subgroup_id);
       }
 
@@ -609,7 +609,7 @@ update_group_show_walkcb (struct update_group *updgrp, void *arg)
             subgrp->peer_refreshes_combined);
     vty_out (vty, "    Merge checks triggered: %u\n",
             subgrp->merge_checks_triggered);
-    vty_outln (vty, "    Version: %" PRIu64 "", subgrp->version);
+    vty_out (vty, "    Version: %" PRIu64 "\n", subgrp->version);
     vty_out (vty, "    Packet queue length: %d\n",
             bpacket_queue_length(SUBGRP_PKTQ(subgrp)));
     vty_out (vty, "    Total packets enqueued: %u\n",
@@ -648,7 +648,7 @@ updgrp_show_packet_queue_walkcb (struct update_group *updgrp, void *arg)
   {
     if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id))
       continue;
-    vty_outln (vty, "update group %" PRIu64 ", subgroup %" PRIu64 "", updgrp->id,
+    vty_out (vty, "update group %" PRIu64 ", subgroup %" PRIu64 "\n", updgrp->id,
             subgrp->id);
     bpacket_queue_show_vty (SUBGRP_PKTQ (subgrp), vty);
   }

diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index 02de6a1c1cc9f390d115737cfc2961aa53968941..aa3a53098e399f24ba95bf8a1ba54d12820491a6 100644 (file)
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -226,16 +226,16 @@ subgrp_show_adjq_vty (struct update_subgroup *subgrp, struct vty *vty,
        {
          if (header1)
            {
-             vty_outln (vty,
-                      "BGP table version is %" PRIu64 ", local router ID is %s",
+             vty_out (vty,
+                      "BGP table version is %" PRIu64 ", local router ID is %s\n",
                       table->version,inet_ntoa(bgp->router_id));
-             vty_outln (vty, BGP_SHOW_SCODE_HEADER, VTYNL);
-             vty_outln (vty, BGP_SHOW_OCODE_HEADER, VTYNL);
+             vty_out (vty, BGP_SHOW_SCODE_HEADER);
+             vty_out (vty, BGP_SHOW_OCODE_HEADER);
              header1 = 0;
            }
          if (header2)
            {
-             vty_outln (vty, BGP_SHOW_HEADER);
+             vty_out (vty, BGP_SHOW_HEADER);
              header2 = 0;
            }
          if ((flags & UPDWALK_FLAGS_ADVQUEUE) && adj->adv && adj->adv->baa)
@@ -266,7 +266,7 @@ updgrp_show_adj_walkcb (struct update_group *updgrp, void *arg)
   {
     if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id))
       continue;
-    vty_outln (vty, "update group %" PRIu64 ", subgroup %" PRIu64 "", updgrp->id,
+    vty_out (vty, "update group %" PRIu64 ", subgroup %" PRIu64 "\n", updgrp->id,
             subgrp->id);
     subgrp_show_adjq_vty (subgrp, vty, ctx->flags);
   }

diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
index a2665b67b9b1a9ffa71f408fbc43adfcf3582df9..e829c9cf2b5f414c2d0bf3b1a7da5babd52f46cc 100644 (file)
--- a/bgpd/bgp_vpn.c
+++ b/bgpd/bgp_vpn.c
@@ -110,7 +110,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd,
                                      "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
                           vty_out (vty, "Origin codes: i - IGP, e - EGP, ? - incomplete%s\n",
                                    VTYNL);
-                          vty_outln (vty, V4_HEADER);
+                          vty_out (vty, V4_HEADER);
                         }
                       header = 0;
                     }

diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index ef8ae1a094da944487a9f85a37c74a857b6338a7..233734f14a7e3c85acce0513ae5de7f240c5eec9 100644 (file)
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -491,7 +491,7 @@ DEFUN (vnc_defaults_l2rd,
       value = value_l & 0xff;
       if (!argv[1]->arg[0] || *end)
         {
-          vty_outln (vty, "%% Malformed l2 nve ID \"%s\"",argv[1]->arg);
+          vty_out (vty, "%% Malformed l2 nve ID \"%s\"\n",argv[1]->arg);
           return CMD_WARNING;
         }
       if ((value_l < 1) || (value_l > 0xff))
@@ -2606,7 +2606,7 @@ bgp_rfapi_delete_nve_group (
                 vty_out (vty, " un=");
               rfapiPrintRfapiIpAddr (vty, &rfd->un_addr);
               if (vty)
-                vty_outln (vty, " to new group \"%s\"",rfd->rfg->name);
+                vty_out (vty, " to new group \"%s\"\n",rfd->rfg->name);
 
             }
         }
@@ -2644,7 +2644,7 @@ bgp_rfapi_delete_named_nve_group (
       if (!rfg)
         {
           if (vty)
-            vty_outln (vty, "No NVE group named \"%s\"",rfg_name);
+            vty_out (vty, "No NVE group named \"%s\"\n",rfg_name);
           return CMD_WARNING;
         }
     }
@@ -2740,7 +2740,7 @@ DEFUN (vnc_nve_group_prefix,
 
   if (!str2prefix (argv[2]->arg, &p))
     {
-      vty_outln (vty, "Malformed prefix \"%s\"", argv[2]->arg);
+      vty_out (vty, "Malformed prefix \"%s\"\n", argv[2]->arg);
       return CMD_WARNING;
     }
 
@@ -2773,7 +2773,7 @@ DEFUN (vnc_nve_group_prefix,
           /*
            * different group name: fail
            */
-          vty_outln (vty, "nve group \"%s\" already has \"%s\" prefix %s",
+          vty_out (vty, "nve group \"%s\" already has \"%s\" prefix %s\n",
                    ((struct rfapi_nve_group_cfg *) (rn->info))->name,
                    argv[1]->arg, argv[2]->arg);
           return CMD_WARNING;
@@ -3054,7 +3054,7 @@ DEFUN (vnc_nve_group_l2rd,
 
       if (!argv[1]->arg[0] || *end)
         {
-          vty_outln (vty, "%% Malformed l2 nve ID \"%s\"",argv[1]->arg);
+          vty_out (vty, "%% Malformed l2 nve ID \"%s\"\n",argv[1]->arg);
           return CMD_WARNING;
         }
       if ((value_l < 1) || (value_l > 0xff))
@@ -3808,7 +3808,7 @@ bgp_rfapi_delete_named_l2_group (
       if (!rfg)
         {
           if (vty)
-            vty_outln (vty, "No L2 group named \"%s\"",rfg_name);
+            vty_out (vty, "No L2 group named \"%s\"\n",rfg_name);
           return CMD_WARNING;
         }
     }

diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index f9156863bf8ead87464e7346bae540af8ce3a7ea..c78045d1e88ad839ab9f6eccfac4ed40b1eb6bd6 100644 (file)
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -3101,12 +3101,12 @@ DEFUN (
 
   if (!str2prefix (argv[5]->arg, &pfx))
     {
-      vty_outln (vty, "Malformed address \"%s\"", argv[5]->arg);
+      vty_out (vty, "Malformed address \"%s\"\n", argv[5]->arg);
       return CMD_WARNING;
     }
   if (pfx.family != AF_INET && pfx.family != AF_INET6)
     {
-      vty_outln (vty, "Invalid address \"%s\"", argv[5]->arg);
+      vty_out (vty, "Invalid address \"%s\"\n", argv[5]->arg);
       return CMD_WARNING;
     }
 
@@ -3321,12 +3321,12 @@ DEFUN (debug_rfapi_register_vn_un,
    */
   if (!str2prefix (argv[8]->arg, &pfx))
     {
-      vty_outln (vty, "Malformed prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Malformed prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   if (pfx.family != AF_INET && pfx.family != AF_INET6)
     {
-      vty_outln (vty, "Bad family for prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Bad family for prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   rfapiQprefix2Rprefix (&pfx, &hpfx);
@@ -3410,12 +3410,12 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
    */
   if (!str2prefix (argv[8]->arg, &pfx))
     {
-      vty_outln (vty, "Malformed prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Malformed prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   if (pfx.family != AF_INET && pfx.family != AF_INET6)
     {
-      vty_outln (vty, "Bad family for prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Bad family for prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   rfapiQprefix2Rprefix (&pfx, &hpfx);
@@ -3434,7 +3434,7 @@ DEFUN (debug_rfapi_register_vn_un_l2o,
   optary[opt_next].v.l2addr.logical_net_id = strtoul(argv[14]->arg, NULL, 10);
   if ((rc = rfapiStr2EthAddr (argv[12]->arg, &optary[opt_next].v.l2addr.macaddr)))
     {
-      vty_outln (vty, "Bad mac address \"%s\"", argv[12]->arg);
+      vty_out (vty, "Bad mac address \"%s\"\n", argv[12]->arg);
       return CMD_WARNING;
     }
   optary[opt_next].type = RFAPI_VN_OPTION_TYPE_L2ADDR;
@@ -3506,12 +3506,12 @@ DEFUN (debug_rfapi_unregister_vn_un,
    */
   if (!str2prefix (argv[8]->arg, &pfx))
     {
-      vty_outln (vty, "Malformed prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Malformed prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   if (pfx.family != AF_INET && pfx.family != AF_INET6)
     {
-      vty_outln (vty, "Bad family for prefix \"%s\"", argv[8]->arg);
+      vty_out (vty, "Bad family for prefix \"%s\"\n", argv[8]->arg);
       return CMD_WARNING;
     }
   rfapiQprefix2Rprefix (&pfx, &hpfx);
@@ -3659,7 +3659,7 @@ DEFUN (debug_rfapi_query_vn_un_l2o,
   memset (&l2o_buf, 0, sizeof (l2o_buf));
   if (rfapiStr2EthAddr (argv[10]->arg, &l2o_buf.macaddr))
     {
-      vty_outln (vty, "Bad mac address \"%s\"", argv[10]->arg);
+      vty_out (vty, "Bad mac address \"%s\"\n", argv[10]->arg);
       return CMD_WARNING;
     }
 

diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index dfbffadf36bda3196befa3407bf21defaaa40053..9cb6ccbd978d60679cb9af6546811f61e3acca03 100644 (file)
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -2296,13 +2296,13 @@ register_add (
 
        if (!str2prefix (arg_prefix, &pfx))
          {
-           vty_outln (vty, "Malformed prefix \"%s\"",arg_prefix);
+           vty_out (vty, "Malformed prefix \"%s\"\n",arg_prefix);
            goto fail;
          }
        if (pfx.family != AF_INET
            && pfx.family != AF_INET6)
          {
-           vty_outln (vty, "prefix \"%s\" has invalid address family",
+           vty_out (vty, "prefix \"%s\" has invalid address family\n",
                     arg_prefix);
            goto fail;
          }
@@ -2410,8 +2410,8 @@ register_add (
          {
            if (!arg_vni)
              {
-               vty_outln (vty,
-                        "Missing \"vni\" parameter (mandatory with mac)");
+               vty_out (vty,
+                        "Missing \"vni\" parameter (mandatory with mac)\n");
                return CMD_WARNING;
              }
            optary[opt_next].v.l2addr.logical_net_id = strtoul(arg_vni, NULL,
@@ -3129,7 +3129,7 @@ parse_deleter_args (
 
       if (!str2prefix (arg_prefix, &rcdarg->prefix))
         {
-          vty_outln (vty, "Malformed prefix \"%s\"", arg_prefix);
+          vty_out (vty, "Malformed prefix \"%s\"\n", arg_prefix);
           return rc;
         }
     }
@@ -3145,7 +3145,7 @@ parse_deleter_args (
         {
           if ((rc = rfapiStr2EthAddr (arg_l2addr, &rcdarg->l2o.o.macaddr)))
             {
-              vty_outln (vty, "Malformed L2 Address \"%s\"",
+              vty_out (vty, "Malformed L2 Address \"%s\"\n",
                        arg_l2addr);
               return rc;
             }
@@ -3161,7 +3161,7 @@ parse_deleter_args (
     {
       if (!str2prefix_rd (arg_rd, &rcdarg->rd))
         {
-          vty_outln (vty, "Malformed RD \"%s\"",
+          vty_out (vty, "Malformed RD \"%s\"\n",
                    arg_rd);
           return rc;
         }
@@ -4574,8 +4574,8 @@ rfapi_show_nves (
       if (!printed)
         {
           /* print out a header */
-          vty_outln (vty,
-                     "                                " "Active      Next Hops");
+          vty_out (vty,
+                     "                                Active      Next Hops\n");
           vty_out (vty, "%-15s %-15s %-5s %-5s %-6s %-6s %s\n",
                    "VN Address",
                    "UN Address",
@@ -4653,12 +4653,12 @@ DEFUN (vnc_show_nves_ptct,
 
   if (!str2prefix (argv[4]->arg, &pfx))
     {
-      vty_outln (vty, "Malformed address \"%s\"", argv[4]->arg);
+      vty_out (vty, "Malformed address \"%s\"\n", argv[4]->arg);
       return CMD_WARNING;
     }
   if (pfx.family != AF_INET && pfx.family != AF_INET6)
     {
-      vty_outln (vty, "Invalid address \"%s\"", argv[4]->arg);
+      vty_out (vty, "Invalid address \"%s\"\n", argv[4]->arg);
       return CMD_WARNING;
     }
 
@@ -5019,31 +5019,31 @@ vnc_add_vrf_prefix (struct vty *vty,
   /* arg checks */
   if (!rfg)
     {
-      vty_outln (vty, "VRF \"%s\" appears not to be configured.",
+      vty_out (vty, "VRF \"%s\" appears not to be configured.\n",
                arg_vrf);
           return CMD_WARNING;
     }
   if (!rfg->rt_export_list || !rfg->rfapi_import_table)
     {
-      vty_outln (vty, "VRF \"%s\" is missing RT import/export RT configuration.",
+      vty_out (vty, "VRF \"%s\" is missing RT import/export RT configuration.\n",
                arg_vrf);
       return CMD_WARNING;
     }
   if (!rfg->rd.family && !arg_rd)
     {
-      vty_outln (vty, "VRF \"%s\" isn't configured with an RD, so RD must be provided.",
+      vty_out (vty, "VRF \"%s\" isn't configured with an RD, so RD must be provided.\n",
                arg_vrf);
       return CMD_WARNING;
     }
   if (rfg->label > MPLS_LABEL_MAX && !arg_label)
     {
-      vty_outln (vty, "VRF \"%s\" isn't configured with a default labels, so a label must be provided.",
+      vty_out (vty, "VRF \"%s\" isn't configured with a default labels, so a label must be provided.\n",
                arg_vrf);
       return CMD_WARNING;
     }
   if (!str2prefix (arg_prefix, &pfx))
     {
-      vty_outln (vty, "Malformed prefix \"%s\"",
+      vty_out (vty, "Malformed prefix \"%s\"\n",
                arg_prefix);
       return CMD_WARNING;
     }
@@ -5057,7 +5057,7 @@ vnc_add_vrf_prefix (struct vty *vty,
       opt->type = RFAPI_VN_OPTION_TYPE_INTERNAL_RD;
       if (!str2prefix_rd (arg_rd, &opt->v.internal_rd))
         {
-          vty_outln (vty, "Malformed RD \"%s\"",
+          vty_out (vty, "Malformed RD \"%s\"\n",
                    arg_rd);
           return CMD_WARNING;
         }
@@ -5085,7 +5085,7 @@ vnc_add_vrf_prefix (struct vty *vty,
       pref = strtoul (arg_pref, &endptr, 10);
       if (*endptr != '\0')
         {
-          vty_outln (vty, "%% Invalid local-preference value \"%s\"",
+          vty_out (vty, "%% Invalid local-preference value \"%s\"\n",
                      arg_pref);
           return CMD_WARNING;
          }
@@ -5272,7 +5272,7 @@ vnc_clear_vrf (struct vty *vty,
   /* arg checks */
   if (!rfg)
     {
-      vty_outln (vty, "VRF \"%s\" appears not to be configured.",
+      vty_out (vty, "VRF \"%s\" appears not to be configured.\n",
                arg_vrf);
           return CMD_WARNING;
     }

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index b57e7f1bcfa96aead316456d0b2101732b0c9225..7ba234d0ff3daf01c257d24c090b901c6c941700 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -300,8 +300,8 @@ show_ip_eigrp_topology_header (struct vty *vty, struct eigrp *eigrp)
 
   vty_out (vty, "%sEIGRP Topology Table for AS(%d)/ID(%s)%s\n",
            VTYNL, eigrp->AS, inet_ntoa(router_id), VTYNL);
-  vty_outln (vty, "Codes: P - Passive, A - Active, U - Update, Q - Query, "
-           "R - Reply%s       r - reply Status, s - sia Status%s",
+  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);
 }
 
@@ -315,7 +315,7 @@ show_ip_eigrp_prefix_entry (struct vty *vty, struct eigrp_prefix_entry *tn)
   vty_out (vty, "%s/%u, ",
           inet_ntoa (tn->destination_ipv4->prefix), tn->destination_ipv4->prefixlen);
   vty_out (vty, "%u successors, ", successors->count);
-  vty_outln (vty, "FD is %u, serno: %" PRIu64 " ", tn->fdistance, tn->serno);
+  vty_out (vty, "FD is %u, serno: %" PRIu64 " \n", tn->fdistance, tn->serno);
 
   list_delete(successors);
 }

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index fae8cb0d876f29257c81dc5e34f72fbd15584fa9..aeaedbe3e1a1aad7458a63bdf06dac827b615d41 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -912,13 +912,13 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
             {
               vty_out (vty, ", Active neighbors: %u\n",
                        circuit->upadjcount[0]);
-              vty_outln (vty, "      Hello interval: %u, "
-                            "Holddown count: %u %s",
+              vty_out (vty, "      Hello interval: %u, "
+                            "Holddown count: %u %s\n",
                        circuit->hello_interval[0],
                        circuit->hello_multiplier[0],
                        (circuit->pad_hellos ? "(pad)" : "(no-pad)"));
-              vty_outln (vty, "      CNSP interval: %u, "
-                            "PSNP interval: %u",
+              vty_out (vty, "      CNSP interval: %u, "
+                            "PSNP interval: %u\n",
                        circuit->csnp_interval[0],
                        circuit->psnp_interval[0]);
               if (circuit->circ_type == CIRCUIT_T_BROADCAST)
@@ -943,13 +943,13 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
             {
               vty_out (vty, ", Active neighbors: %u\n",
                        circuit->upadjcount[1]);
-              vty_outln (vty, "      Hello interval: %u, "
-                            "Holddown count: %u %s",
+              vty_out (vty, "      Hello interval: %u, "
+                            "Holddown count: %u %s\n",
                        circuit->hello_interval[1],
                        circuit->hello_multiplier[1],
                        (circuit->pad_hellos ? "(pad)" : "(no-pad)"));
-              vty_outln (vty, "      CNSP interval: %u, "
-                            "PSNP interval: %u",
+              vty_out (vty, "      CNSP interval: %u, "
+                            "PSNP interval: %u\n",
                        circuit->csnp_interval[1],
                        circuit->psnp_interval[1]);
               if (circuit->circ_type == CIRCUIT_T_BROADCAST)

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 2434229acaff639626cf102b3775ed06fe1d6657..c320ff79a0f43b0ba8f6d42f199622ebdbd5bc2f 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -874,11 +874,11 @@ lsp_print_mt_ipv6_reach(struct list *list, struct vty *vty, uint16_t mtid)
         {
           if ((ipv6_reach->control_info &
                CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-            vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv6-Internal : %s/%d",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-Internal : %s/%d\n",
                        ntohl (ipv6_reach->metric),
                        buff, ipv6_reach->prefix_len);
           else
-            vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv6-External : %s/%d",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-External : %s/%d\n",
                        ntohl (ipv6_reach->metric),
                        buff, ipv6_reach->prefix_len);
         }
@@ -886,12 +886,12 @@ lsp_print_mt_ipv6_reach(struct list *list, struct vty *vty, uint16_t mtid)
         {
           if ((ipv6_reach->control_info &
                CTRL_INFO_DISTRIBUTION) == DISTRIBUTION_INTERNAL)
-            vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Int   : %s/%d %s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Int   : %s/%d %s\n",
                        ntohl (ipv6_reach->metric),
                        buff, ipv6_reach->prefix_len,
                        isis_mtid2str(mtid));
           else
-            vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Ext   : %s/%d %s",
+            vty_out (vty, "  Metric      : %-8" PRIu32 " IPv6-MT-Ext   : %s/%d %s\n",
                        ntohl (ipv6_reach->metric),
                        buff, ipv6_reach->prefix_len,
                        isis_mtid2str(mtid));
@@ -910,7 +910,7 @@ lsp_print_mt_ipv4_reach(struct list *list, struct vty *vty, uint16_t mtid)
       if (mtid == ISIS_MT_IPV4_UNICAST)
         {
           /* FIXME: There should be better way to output this stuff. */
-          vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv4-Extended : %s/%d",
+          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-Extended : %s/%d\n",
                      ntohl (te_ipv4_reach->te_metric),
                      inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
                                                   te_ipv4_reach->control)),
@@ -919,7 +919,7 @@ lsp_print_mt_ipv4_reach(struct list *list, struct vty *vty, uint16_t mtid)
       else
         {
           /* FIXME: There should be better way to output this stuff. */
-          vty_outln (vty, "  Metric      : %-8" PRIu32 " IPv4-MT       : %s/%d %s",
+          vty_out (vty, "  Metric      : %-8" PRIu32 " IPv4-MT       : %s/%d %s\n",
                      ntohl (te_ipv4_reach->te_metric),
                      inet_ntoa (newprefix2inaddr (&te_ipv4_reach->prefix_start,
                                                   te_ipv4_reach->control)),
@@ -1023,7 +1023,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
     for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.is_neighs, lnode, is_neigh))
       {
        lspid_print (is_neigh->neigh_id, LSPid, dynhost, 0);
-       vty_outln (vty, "  Metric      : %-8" PRIu8 " IS            : %s",
+       vty_out (vty, "  Metric      : %-8" PRIu8 " IS            : %s\n",
                   is_neigh->metrics.metric_default, LSPid);
       }
   
@@ -1036,7 +1036,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
              sizeof (ipv4_reach_prefix));
       memcpy (ipv4_reach_mask, inet_ntoa (ipv4_reach->mask),
              sizeof (ipv4_reach_mask));
-      vty_outln (vty, "  Metric      : %-8" PRIu8 " IPv4-Internal : %s %s",
+      vty_out (vty, "  Metric      : %-8" PRIu8 " IPv4-Internal : %s %s\n",
                 ipv4_reach->metrics.metric_default, ipv4_reach_prefix,
                 ipv4_reach_mask);
     }
@@ -1050,7 +1050,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
              sizeof (ipv4_reach_prefix));
       memcpy (ipv4_reach_mask, inet_ntoa (ipv4_reach->mask),
              sizeof (ipv4_reach_mask));
-      vty_outln (vty, "  Metric      : %-8" PRIu8 " IPv4-External : %s %s",
+      vty_out (vty, "  Metric      : %-8" PRIu8 " IPv4-External : %s %s\n",
                 ipv4_reach->metrics.metric_default, ipv4_reach_prefix,
                 ipv4_reach_mask);
     }

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index ac6ba59a7a9b0eeab5c517a91a164f855352a4a4..a85cef6405a21b52d00fe8f0ef3fa4aa605a3e3d 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1321,8 +1321,8 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
   struct isis_adjacency *adj;
   char buff[PREFIX2STR_BUFFER];
 
-  vty_outln (vty,
-             "Vertex               Type         Metric " "Next-Hop             Interface Parent");
+  vty_out (vty,
+             "Vertex               Type         Metric Next-Hop             Interface Parent\n");
 
   for (ALL_LIST_ELEMENTS_RO (paths, node, vertex)) {
       if (memcmp (vertex->N.id, root_sysid, ISIS_SYS_ID_LEN) == 0) {

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index bccf8d428ffec6661b5c96e91b17530018ce1746..784f29f0e56c6e21fd6fe1c1a2e3b3725badfa5d 100644 (file)
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -272,8 +272,8 @@ DEFUN (isis_network,
 
   if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_P2P))
     {
-      vty_outln (vty,
-                 "isis network point-to-point " "is valid only on broadcast interfaces");
+      vty_out (vty,
+                 "isis network point-to-point is valid only on broadcast interfaces\n");
       return CMD_ERR_AMBIGUOUS;
     }
 
@@ -294,8 +294,8 @@ DEFUN (no_isis_network,
 
   if (isis_circuit_circ_type_set(circuit, CIRCUIT_T_BROADCAST))
     {
-      vty_outln (vty,
-                 "isis network point-to-point " "is valid only on broadcast interfaces");
+      vty_out (vty,
+                 "isis network point-to-point is valid only on broadcast interfaces\n");
       return CMD_ERR_AMBIGUOUS;
     }
 
@@ -509,8 +509,8 @@ DEFUN (isis_metric,
   if (circuit->area && circuit->area->oldmetric == 1 &&
       met > MAX_NARROW_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-63> "
-               "when narrow metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-63> "
+               "when narrow metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -519,8 +519,8 @@ DEFUN (isis_metric,
   if (circuit->area && circuit->area->newmetric == 1 &&
       met > MAX_WIDE_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-16777215> "
-               "when wide metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-16777215> "
+               "when wide metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -569,8 +569,8 @@ DEFUN (isis_metric_l1,
   if (circuit->area && circuit->area->oldmetric == 1 &&
       met > MAX_NARROW_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-63> "
-               "when narrow metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-63> "
+               "when narrow metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -579,8 +579,8 @@ DEFUN (isis_metric_l1,
   if (circuit->area && circuit->area->newmetric == 1 &&
       met > MAX_WIDE_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-16777215> "
-               "when wide metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-16777215> "
+               "when wide metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -628,8 +628,8 @@ DEFUN (isis_metric_l2,
   if (circuit->area && circuit->area->oldmetric == 1 &&
       met > MAX_NARROW_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-63> "
-               "when narrow metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-63> "
+               "when narrow metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -638,8 +638,8 @@ DEFUN (isis_metric_l2,
   if (circuit->area && circuit->area->newmetric == 1 &&
       met > MAX_WIDE_LINK_METRIC)
     {
-      vty_outln (vty, "Invalid metric %d - should be <0-16777215> "
-               "when wide metric type enabled",
+      vty_out (vty, "Invalid metric %d - should be <0-16777215> "
+               "when wide metric type enabled\n",
                met);
       return CMD_ERR_AMBIGUOUS;
     }
@@ -1606,8 +1606,8 @@ set_lsp_gen_interval (struct vty *vty, struct isis_area *area,
 
       if (interval >= area->lsp_refresh[lvl-1])
         {
-          vty_outln (vty, "LSP gen interval %us must be less than "
-                   "the LSP refresh interval %us",
+          vty_out (vty, "LSP gen interval %us must be less than "
+                   "the LSP refresh interval %us\n",
                    interval, area->lsp_refresh[lvl - 1]);
           return CMD_ERR_AMBIGUOUS;
         }
@@ -1845,17 +1845,17 @@ area_max_lsp_lifetime_set(struct vty *vty, int level,
 
       if (refresh_interval < area->lsp_refresh[lvl-1])
         {
-          vty_outln (vty, "Level %d Max LSP lifetime %us must be 300s greater than "
-                   "the configured LSP refresh interval %us",
+          vty_out (vty, "Level %d Max LSP lifetime %us must be 300s greater than "
+                   "the configured LSP refresh interval %us\n",
                    lvl, interval, area->lsp_refresh[lvl - 1]);
-          vty_outln (vty, "Automatically reducing level %d LSP refresh interval "
-                   "to %us", lvl, refresh_interval);
+          vty_out (vty, "Automatically reducing level %d LSP refresh interval "
+                   "to %us\n", lvl, refresh_interval);
           set_refresh_interval[lvl-1] = 1;
 
           if (refresh_interval <= area->lsp_gen_interval[lvl-1])
             {
-              vty_outln (vty, "LSP refresh interval %us must be greater than "
-                       "the configured LSP gen interval %us",
+              vty_out (vty, "LSP refresh interval %us must be greater than "
+                       "the configured LSP gen interval %us\n",
                        refresh_interval,area->lsp_gen_interval[lvl - 1]);
               return CMD_ERR_AMBIGUOUS;
             }
@@ -1929,15 +1929,15 @@ area_lsp_refresh_interval_set(struct vty *vty, int level, uint16_t interval)
         continue;
       if (interval <= area->lsp_gen_interval[lvl-1])
         {
-          vty_outln (vty, "LSP refresh interval %us must be greater than "
-                   "the configured LSP gen interval %us",
+          vty_out (vty, "LSP refresh interval %us must be greater than "
+                   "the configured LSP gen interval %us\n",
                    interval,area->lsp_gen_interval[lvl - 1]);
           return CMD_ERR_AMBIGUOUS;
         }
       if (interval > (area->max_lsp_lifetime[lvl-1] - 300))
         {
-          vty_outln (vty, "LSP refresh interval %us must be less than "
-                   "the configured LSP lifetime %us less 300",
+          vty_out (vty, "LSP refresh interval %us must be less than "
+                   "the configured LSP lifetime %us less 300\n",
                    interval,area->max_lsp_lifetime[lvl - 1]);
           return CMD_ERR_AMBIGUOUS;
         }

diff --git a/isisd/isisd.c b/isisd/isisd.c
index c089450cc54407eb51a7f87e60e913fb7c924498..7436d9f93a8b3e737494321c3755497455e2975e 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -396,8 +396,8 @@ area_net_title (struct vty *vty, const char *net_title)
        */
       if (memcmp (isis->sysid, GETSYSID (addr), ISIS_SYS_ID_LEN))
        {
-         vty_outln (vty,
-                  "System ID must not change when defining additional area" " addresses");
+         vty_out (vty,
+                  "System ID must not change when defining additional area addresses\n");
          XFREE (MTYPE_ISIS_AREA_ADDR, addr);
          return CMD_ERR_AMBIGUOUS;
        }
@@ -589,8 +589,8 @@ show_isis_neighbor_common (struct vty *vty, const char *id, char detail)
       vty_out (vty, "Area %s:\n", area->area_tag);
 
       if (detail == ISIS_UI_LEVEL_BRIEF)
-        vty_outln (vty,
-                   "  System Id           Interface   L  State" "        Holdtime SNPA");
+        vty_out (vty,
+                   "  System Id           Interface   L  State        Holdtime SNPA\n");
 
       for (ALL_LIST_ELEMENTS_RO (area->circuit_list, cnode, circuit))
         {
@@ -1543,8 +1543,8 @@ show_isis_database (struct vty *vty, const char *argv, int ui_level)
                            level + 1);
 
                   /* print the title in all cases */
-                  vty_outln (vty,
-                             "LSP ID                  PduLen  " "SeqNumber   Chksum  Holdtime  ATT/P/OL");
+                  vty_out (vty,
+                             "LSP ID                  PduLen  SeqNumber   Chksum  Holdtime  ATT/P/OL\n");
                 }
 
               if (lsp)

diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c
index c5f444ecd30fc724fbe864a6e83d060b1883267a..bf2de7b6867820125ae8044855657610f38f55d6 100644 (file)
--- a/ldpd/ldp_debug.c
+++ b/ldpd/ldp_debug.c
@@ -116,13 +116,13 @@ ldp_vty_show_debugging(struct vty *vty)
        if (LDP_DEBUG(event, EVENT))
                vty_out (vty, "  LDP events debugging is on\n");
        if (LDP_DEBUG(msg, MSG_RECV_ALL))
-               vty_outln (vty,
-                         "  LDP detailed messages debugging is on " "(inbound)");
+               vty_out (vty,
+                         "  LDP detailed messages debugging is on (inbound)\n");
        else if (LDP_DEBUG(msg, MSG_RECV))
                vty_out (vty,"  LDP messages debugging is on (inbound)\n");
        if (LDP_DEBUG(msg, MSG_SEND_ALL))
-               vty_outln (vty,
-                         "  LDP detailed messages debugging is on " "(outbound)");
+               vty_out (vty,
+                         "  LDP detailed messages debugging is on (outbound)\n");
        else if (LDP_DEBUG(msg, MSG_SEND))
                vty_out (vty,"  LDP messages debugging is on (outbound)\n");
        if (LDP_DEBUG(zebra, ZEBRA))

diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c
index 0f86e24a37596da9a0c5ad19d852f41729b18df5..753ac802dbf9f790788dc8cc208dc8527c2dc9c8 100644 (file)
--- a/ldpd/ldp_vty_conf.c
+++ b/ldpd/ldp_vty_conf.c
@@ -171,8 +171,8 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf,
                vty_out (vty, "  discovery transport-address %s\n",
                    log_addr(af, &af_conf->trans_addr));
                else
-                       vty_outln (vty,
-                                 "  ! Incomplete config, specify a discovery " "transport-address");
+                       vty_out (vty,
+                                 "  ! Incomplete config, specify a discovery transport-address\n");
 
        if ((af_conf->flags & F_LDPD_AF_ALLOCHOSTONLY) ||
            af_conf->acl_label_allocate_for[0] != '\0') {
@@ -282,12 +282,12 @@ ldp_config_write(struct vty *vty)
 
                if (nbrp->flags & F_NBRP_GTSM) {
                        if (nbrp->gtsm_enabled)
-                               vty_outln (vty, " neighbor %s ttl-security hops "
-                                   "%u",  inet_ntoa(nbrp->lsr_id),
+                               vty_out (vty, " neighbor %s ttl-security hops "
+                                   "%u\n",  inet_ntoa(nbrp->lsr_id),
                                    nbrp->gtsm_hops);
                        else
-                               vty_outln (vty, " neighbor %s ttl-security "
-                                   "disable",inet_ntoa(nbrp->lsr_id));
+                               vty_out (vty, " neighbor %s ttl-security "
+                                   "disable\n",inet_ntoa(nbrp->lsr_id));
                }
 
                if (nbrp->auth.method == AUTH_MD5SIG)
@@ -333,8 +333,8 @@ ldp_l2vpn_pw_config_write(struct vty *vty, struct l2vpn_pw *pw)
                vty_out (vty, "  pw-status disable\n");
 
        if (missing_lsrid)
-               vty_outln (vty,
-                         "  ! Incomplete config, specify a neighbor " "lsr-id");
+               vty_out (vty,
+                         "  ! Incomplete config, specify a neighbor lsr-id\n");
        if (missing_pwid)
                vty_out (vty,"  ! Incomplete config, specify a pw-id\n");
 }

diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c
index 45c5fedb2e71999fe8c415765fc0f5adfe3ec386..368edebe5949fbb1d0fa4df3bf9a1d01e12353f4 100644 (file)
--- a/ldpd/ldp_vty_exec.c
+++ b/ldpd/ldp_vty_exec.c
@@ -564,8 +564,8 @@ show_nbr_detail_msg(struct vty *vty, struct imsg *imsg,
                    log_addr(nbr->af, &nbr->raddr),ntohs(nbr->rport));
                vty_out (vty, "  Authentication: %s\n",
                    (nbr->auth_method == AUTH_MD5SIG) ? "TCP MD5 Signature" : "none");
-               vty_outln(vty, "  Session Holdtime: %u secs; "
-                   "KeepAlive interval: %u secs", nbr->holdtime,
+               vty_out(vty, "  Session Holdtime: %u secs; "
+                   "KeepAlive interval: %u secs\n", nbr->holdtime,
                    nbr->holdtime / KEEPALIVE_PER_PERIOD);
                vty_out(vty, "  State: %s; Downstream-Unsolicited\n",
                    nbr_state_name(nbr->nbr_state));
@@ -869,10 +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_outln (vty, "  Capabilities Sent:%s"
+       vty_out (vty, "  Capabilities Sent:%s"
            "   - Dynamic Announcement (0x0506)%s"
            "   - Typed Wildcard (0x050B)%s"
-           "   - Unrecognized Notification (0x0603)",
+           "   - Unrecognized Notification (0x0603)\n",
            VTYNL, VTYNL, VTYNL);
        vty_out (vty, "  Capabilities Received:\n");
        if (nbr->flags & F_NBR_CAP_DYNAMIC)
@@ -1242,8 +1242,8 @@ show_l2vpn_binding_msg(struct vty *vty, struct imsg *imsg,
                if (pw->local_label != NO_LABEL) {
                        vty_out (vty, "    Local Label:  %u\n",
                                  pw->local_label);
-                       vty_outln (vty, "%-8sCbit: %u,    VC Type: %s,    "
-                           "GroupID: %u", "", pw->local_cword,
+                       vty_out (vty, "%-8sCbit: %u,    VC Type: %s,    "
+                           "GroupID: %u\n", "", pw->local_cword,
                            pw_type_name(pw->type),pw->local_gid);
                        vty_out (vty, "%-8sMTU: %u\n", "",pw->local_ifmtu);
                } else
@@ -1253,8 +1253,8 @@ show_l2vpn_binding_msg(struct vty *vty, struct imsg *imsg,
                if (pw->remote_label != NO_LABEL) {
                        vty_out (vty, "    Remote Label: %u\n",
                            pw->remote_label);
-                       vty_outln (vty, "%-8sCbit: %u,    VC Type: %s,    "
-                           "GroupID: %u", "", pw->remote_cword,
+                       vty_out (vty, "%-8sCbit: %u,    VC Type: %s,    "
+                           "GroupID: %u\n", "", pw->remote_cword,
                            pw_type_name(pw->type),pw->remote_gid);
                        vty_out (vty, "%-8sMTU: %u\n", "",pw->remote_ifmtu);
                } else
@@ -1694,11 +1694,11 @@ ldp_vty_show_capabilities(struct vty *vty, int json)
                return (0);
        }
 
-       vty_outln (vty,
+       vty_out (vty,
            "Supported LDP Capabilities%s"
            " * Dynamic Announcement (0x0506)%s"
            " * Typed Wildcard (0x050B)%s"
-           " * Unrecognized Notification (0x0603)%s", VTYNL,
+           " * Unrecognized Notification (0x0603)%s\n", VTYNL,
            VTYNL, VTYNL, VTYNL);
 
        return (0);

diff --git a/lib/bfd.c b/lib/bfd.c
index 34b6aa83c6dc3790e4b426e6e668d0bd52fb2675..f429ef3e7a3a9dea8d8ca6c6ff19f4294233d8ba 100644 (file)
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -394,8 +394,8 @@ bfd_show_param(struct vty *vty, struct bfd_info *bfd_info, int bfd_tag,
     }
   else
     {
-      vty_outln (vty, "  %s%sDetect Mul: %d, Min Rx interval: %d,"
-                " Min Tx interval: %d",
+      vty_out (vty, "  %s%sDetect Mul: %d, Min Rx interval: %d,"
+                " Min Tx interval: %d\n",
                     (extra_space) ? "  ": "", (bfd_tag) ? "BFD: " : "  ",
                     bfd_info->detect_mult, bfd_info->required_min_rx,
                     bfd_info->desired_min_tx);

diff --git a/lib/filter.c b/lib/filter.c
index b619b8a47d836b50caf85e029fb3c2c968c2f3fb..ae4b0b3b0cc1c322633d789dabfc1243b72609a8 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -1256,8 +1256,8 @@ filter_set_zebra (struct vty *vty, const char *name_str, const char *type_str,
 
   if (strlen(name_str) > ACL_NAMSIZ)
     {
-      vty_outln (vty, "%% ACL name %s is invalid: length exceeds "
-                    "%d characters",
+      vty_out (vty, "%% ACL name %s is invalid: length exceeds "
+                    "%d characters\n",
                name_str, ACL_NAMSIZ);
       return CMD_WARNING;
     }

diff --git a/lib/if.c b/lib/if.c
index 2a17638b4a4eb5f2172f1ba19d85c2a15dd7d83e..d694067816edc18157bf9fa1364fb3212605ddde 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -690,8 +690,8 @@ DEFUN (interface,
 
   if ((sl = strlen(ifname)) > INTERFACE_NAMSIZ)
     {
-      vty_outln (vty, "%% Interface name %s is invalid: length exceeds "
-                   "%d characters",
+      vty_out (vty, "%% Interface name %s is invalid: length exceeds "
+                   "%d characters\n",
               ifname, INTERFACE_NAMSIZ);
       return CMD_WARNING;
     }

diff --git a/lib/routemap.c b/lib/routemap.c
index fe14a704527bf1baf5e02ef05f4bef409cdd7b01..6e483234a6cc02116d379b98c23b02ba9869ffa4 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -2365,8 +2365,8 @@ DEFUN (set_ip_nexthop,
   if (su.sin.sin_addr.s_addr == 0 ||
       IPV4_CLASS_DE(su.sin.sin_addr.s_addr))
     {
-      vty_outln (vty,
-                 "%% nexthop address cannot be 0.0.0.0, multicast " "or reserved");
+      vty_out (vty,
+                 "%% nexthop address cannot be 0.0.0.0, multicast or reserved\n");
       return CMD_WARNING;
     }
 

diff --git a/lib/thread.c b/lib/thread.c
index e59d68b0e03e89ce0bef2c77735ccad849d7201f..10727dd078472e0a727132b2877b1f398aa9f597 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -270,8 +270,8 @@ DEFUN (show_thread_cpu,
   if (argv_find (argv, argc, "FILTER", &idx)) {
     filter = parse_filter (argv[idx]->arg);
     if (!filter) {
-      vty_outln(vty, "Invalid filter \"%s\" specified; must contain at least"
-                     "one of 'RWTEXB'", argv[idx]->arg);
+      vty_out(vty, "Invalid filter \"%s\" specified; must contain at least"
+                     "one of 'RWTEXB'\n", argv[idx]->arg);
       return CMD_WARNING;
     }
   }
@@ -294,8 +294,8 @@ DEFUN (clear_thread_cpu,
   if (argv_find (argv, argc, "FILTER", &idx)) {
     filter = parse_filter (argv[idx]->arg);
     if (!filter) {
-      vty_outln(vty, "Invalid filter \"%s\" specified; must contain at least"
-                     "one of 'RWTEXB'", argv[idx]->arg);
+      vty_out(vty, "Invalid filter \"%s\" specified; must contain at least"
+                     "one of 'RWTEXB'\n", argv[idx]->arg);
       return CMD_WARNING;
     }
   }

diff --git a/lib/vty.c b/lib/vty.c
index 43af31b7013a26ff53de86973f89181217f06bba..8ff8280d488a76422912641059d2edaa85e46f15 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1331,8 +1331,8 @@ vty_telnet_option (struct vty *vty, unsigned char *buf, int nbytes)
                 vty->width = ((vty->sb_buf[1] << 8)|vty->sb_buf[2]);
                 vty->height = ((vty->sb_buf[3] << 8)|vty->sb_buf[4]);
 #ifdef TELNET_OPTION_DEBUG
-                vty_outln (vty, "TELNET NAWS window size negotiation completed: "
-                              "width %d, height %d",
+                vty_out (vty, "TELNET NAWS window size negotiation completed: "
+                              "width %d, height %d\n",
                         vty->width, vty->height);
 #endif
               }

diff --git a/lib/vty.h b/lib/vty.h
index ef537b753d2be60f0232743c10fe973346152691..2e2449fe82d3156b940e6904161e2be7227a6c9d 100644 (file)
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -215,7 +215,7 @@ struct vty_arg
        CPP_WARN("VTY_GET_IPV4_PREFIX is no longer useful, use str2prefix_ipv4() or DEFPY.")
 #define vty_outln(vty, str, ...) \
        vty_out(vty, str "\n", ## __VA_ARGS__) \
-/*     CPP_WARN("vty_outln is no longer useful, use vty_out(...\\n...)") */
+       CPP_WARN("vty_outln is no longer useful, use vty_out(...\\n...)")
 
 /* Default time out value */
 #define VTY_TIMEOUT_DEFAULT 600

diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c
index b126f5d6f6bed23aa2552a923535ba11a24cb9ef..ba1ef7ece3d0de320fec44122bc70c4a4c6c32b6 100644 (file)
--- a/nhrpd/nhrp_vty.c
+++ b/nhrpd/nhrp_vty.c
@@ -677,10 +677,10 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)
        if (ctx->afi != family2afi(sockunion_family(&c->remote_addr)))
                return;
 
-       vty_outln(ctx->vty,
+       vty_out(ctx->vty,
                  "Type: %s%s"
                  "Flags:%s%s%s"
-                 "Protocol-Address: %s/%zu",
+                 "Protocol-Address: %s/%zu\n",
                  nhrp_cache_type_str[c->cur.type],
                  VTYNL,
                  (c->cur.peer && c->cur.peer->online) ? " up": "",
@@ -702,7 +702,7 @@ static void show_ip_opennhrp_cache(struct nhrp_cache *c, void *pctx)
                        sockunion2str(&c->cur.remote_nbma_natoa, buf, sizeof buf));
        }
 
-       vty_outln(ctx->vty, VTYNL);
+       vty_out(ctx->vty, "\n\n");
 }
 
 DEFUN(show_ip_nhrp, show_ip_nhrp_cmd,

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 811617b9dae026718a9279f82c1a7ca1087a50ff..85e276aa091104d6d5f8b00ae1d00a0f34cec52b 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -220,11 +220,11 @@ static void pim_show_assert_internal(struct vty *vty)
   struct pim_ifchannel *ch;
   struct in_addr ifaddr;
 
-  vty_outln (vty,
+  vty_out (vty,
          "CA:   CouldAssert%s"
          "ECA:  Evaluate CouldAssert%s"
          "ATD:  AssertTrackingDesired%s"
-         "eATD: Evaluate AssertTrackingDesired%s",
+         "eATD: Evaluate AssertTrackingDesired%s\n",
          VTYNL, VTYNL, VTYNL, VTYNL);
 
   vty_out (vty,
@@ -2149,14 +2149,14 @@ static void show_rpf_refresh_stats(struct vty *vty, time_t now, json_object *jso
     json_object_int_add(json, "nexthopLookups", qpim_nexthop_lookups);
     json_object_int_add(json, "nexthopLookupsAvoided", nexthop_lookups_avoided);
   } else {
-    vty_outln (vty,
+    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"
-           "Nexthop Lookups Avoided:    %lld",
+           "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,
@@ -2177,10 +2177,10 @@ static void show_scan_oil_stats(struct vty *vty, time_t now)
   pim_time_uptime_begin(uptime_mroute_add, sizeof(uptime_mroute_add), now, qpim_mroute_add_last);
   pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now, qpim_mroute_del_last);
 
-  vty_outln (vty,
+  vty_out (vty,
           "Scan OIL - Last: %s  Events: %lld%s"
           "MFC Add  - Last: %s  Events: %lld%s"
-          "MFC Del  - Last: %s  Events: %lld",
+          "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_mroute_del, (long long)qpim_mroute_del_events);
@@ -5025,8 +5025,8 @@ DEFUN_HIDDEN (interface_ip_pim_ssm,
     return CMD_WARNING;
   }
 
-  vty_outln(vty, "WARN: Enabled PIM SM on interface; configure PIM SSM "
-                 "range if needed");
+  vty_out(vty, "WARN: Enabled PIM SM on interface; configure PIM SSM "
+                 "range if needed\n");
   return CMD_SUCCESS;
 }
 

diff --git a/ripd/ripd.c b/ripd/ripd.c
index 3ee259baa863ad4a1fdf494fc5eee28e6c6bf6c4..e590d483927ec63b2ae5f77604d3dbf5c5b55eae 100644 (file)
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -3474,11 +3474,11 @@ DEFUN (show_ip_rip,
   if (! rip)
     return CMD_SUCCESS;
 
-  vty_outln (vty, "Codes: R - RIP, C - connected, S - Static, O - OSPF, B - BGP%s"
+  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",
+          "     Network            Next Hop         Metric From            Tag Time\n",
           VTYNL, VTYNL,  VTYNL, VTYNL, VTYNL);
   
   for (np = route_top (rip->table); np; np = route_next (np))
@@ -3558,7 +3558,7 @@ DEFUN (show_ip_rip_status,
   if (! rip)
     return CMD_SUCCESS;
 
-  vty_outln (vty, "Routing Protocol is \"rip\"");
+  vty_out (vty, "Routing Protocol is \"rip\"\n");
   vty_out (vty, "  Sending updates every %ld seconds with +/-50%%,",
           rip->update_time);
   vty_out (vty, " next due in %lu seconds\n", 

diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index affb12b8ae9ac384f237bb64785b9dd3d9cef2ec..2519b75f4da0dcfa678feb5974dbed76880e990c 100644 (file)
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -2004,11 +2004,11 @@ DEFUN (show_ipv6_ripng,
     return CMD_SUCCESS;
 
   /* Header of display. */ 
-  vty_outln (vty, "Codes: R - RIPng, C - connected, S - Static, O - OSPF, B - BGP%s"
+  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",
+          "   Network      Next Hop                      Via     Metric Tag Time\n",
           VTYNL, VTYNL, VTYNL,
           VTYNL, VTYNL);
   
@@ -2030,7 +2030,7 @@ DEFUN (show_ipv6_ripng,
          vty_out (vty, "%*s", 18, " ");
 
          vty_out (vty, "%*s", 28, " ");
-         vty_outln (vty, "self      %2d  %3"ROUTE_TAG_PRI"", aggregate->metric,
+         vty_out (vty, "self      %2d  %3"ROUTE_TAG_PRI"\n", aggregate->metric,
                   (route_tag_t)aggregate->tag);
        }
 
@@ -2110,7 +2110,7 @@ DEFUN (show_ipv6_ripng_status,
   if (! ripng)
     return CMD_SUCCESS;
 
-  vty_outln (vty, "Routing Protocol is \"RIPng\"");
+  vty_out (vty, "Routing Protocol is \"RIPng\"\n");
   vty_out (vty, "  Sending updates every %ld seconds with +/-50%%,",
            ripng->update_time);
   vty_out (vty, " next due in %lu seconds\n",

diff --git a/zebra/interface.c b/zebra/interface.c
index e2def4a49979594c0d27c09d67b9b2e4c083a35f..291a792748baaf86399feecb373eb612e6cc3ba3 100644 (file)
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -984,27 +984,27 @@ nd_dump_vty (struct vty *vty, struct interface *ifp)
               zif->ra_sent, zif->ra_rcvd);
       interval = rtadv->MaxRtrAdvInterval;
       if (interval % 1000)
-        vty_outln (vty, "  ND router advertisements are sent every "
-                       "%d milliseconds",interval);
+        vty_out (vty, "  ND router advertisements are sent every "
+                       "%d milliseconds\n",interval);
       else
-        vty_outln (vty, "  ND router advertisements are sent every "
-                       "%d seconds",interval / 1000);
+        vty_out (vty, "  ND router advertisements are sent every "
+                       "%d seconds\n",interval / 1000);
       if (rtadv->AdvDefaultLifetime != -1)
        vty_out (vty, "  ND router advertisements live for %d seconds\n",
                 rtadv->AdvDefaultLifetime);
       else
        vty_out (vty,
                    "  ND router advertisements lifetime tracks ra-interval\n");
-      vty_outln (vty, "  ND router advertisement default router preference is "
-                       "%s",rtadv_pref_strs[rtadv->DefaultPreference]);
+      vty_out (vty, "  ND router advertisement default router preference is "
+                       "%s\n",rtadv_pref_strs[rtadv->DefaultPreference]);
       if (rtadv->AdvManagedFlag)
        vty_out (vty,"  Hosts use DHCP to obtain routable addresses.\n");
       else
        vty_out (vty,"  Hosts use stateless autoconfig for addresses.\n");
       if (rtadv->AdvHomeAgentFlag)
       {
-       vty_outln (vty,
-                         "  ND router advertisements with " "Home Agent flag bit set.");
+       vty_out (vty,
+                         "  ND router advertisements with Home Agent flag bit set.\n");
        if (rtadv->HomeAgentLifetime != -1)
          vty_out (vty, "  Home Agent lifetime is %u seconds\n",
                   rtadv->HomeAgentLifetime);
@@ -1175,13 +1175,13 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 
 #ifdef HAVE_PROC_NET_DEV
   /* Statistics print out using proc file system. */
-  vty_outln (vty, "    %lu input packets (%lu multicast), %lu bytes, "
-          "%lu dropped",
+  vty_out (vty, "    %lu input packets (%lu multicast), %lu bytes, "
+          "%lu dropped\n",
           ifp->stats.rx_packets, ifp->stats.rx_multicast,
           ifp->stats.rx_bytes, ifp->stats.rx_dropped);
 
-  vty_outln (vty, "    %lu input errors, %lu length, %lu overrun,"
-          " %lu CRC, %lu frame",
+  vty_out (vty, "    %lu input errors, %lu length, %lu overrun,"
+          " %lu CRC, %lu frame\n",
           ifp->stats.rx_errors, ifp->stats.rx_length_errors,
           ifp->stats.rx_over_errors, ifp->stats.rx_crc_errors,
           ifp->stats.rx_frame_errors);
@@ -1193,8 +1193,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
           ifp->stats.tx_packets, ifp->stats.tx_bytes,
           ifp->stats.tx_dropped);
 
-  vty_outln (vty, "    %lu output errors, %lu aborted, %lu carrier,"
-          " %lu fifo, %lu heartbeat",
+  vty_out (vty, "    %lu output errors, %lu aborted, %lu carrier,"
+          " %lu fifo, %lu heartbeat\n",
           ifp->stats.tx_errors, ifp->stats.tx_aborted_errors,
           ifp->stats.tx_carrier_errors, ifp->stats.tx_fifo_errors,
           ifp->stats.tx_heartbeat_errors);
@@ -1206,8 +1206,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
 #ifdef HAVE_NET_RT_IFLIST
 #if defined (__bsdi__) || defined (__NetBSD__)
   /* Statistics print out using sysctl (). */
-  vty_outln (vty, "    input packets %llu, bytes %llu, dropped %llu,"
-           " multicast packets %llu",
+  vty_out (vty, "    input packets %llu, bytes %llu, dropped %llu,"
+           " multicast packets %llu\n",
            (unsigned long long)ifp->stats.ifi_ipackets,
            (unsigned long long)ifp->stats.ifi_ibytes,
            (unsigned long long)ifp->stats.ifi_iqdrops,
@@ -1216,8 +1216,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
   vty_out (vty, "    input errors %llu\n",
            (unsigned long long)ifp->stats.ifi_ierrors);
 
-  vty_outln (vty, "    output packets %llu, bytes %llu,"
-           " multicast packets %llu",
+  vty_out (vty, "    output packets %llu, bytes %llu,"
+           " multicast packets %llu\n",
            (unsigned long long)ifp->stats.ifi_opackets,
            (unsigned long long)ifp->stats.ifi_obytes,
            (unsigned long long)ifp->stats.ifi_omcasts);
@@ -1229,8 +1229,8 @@ if_dump_vty (struct vty *vty, struct interface *ifp)
            (unsigned long long)ifp->stats.ifi_collisions);
 #else
   /* Statistics print out using sysctl (). */
-  vty_outln (vty, "    input packets %lu, bytes %lu, dropped %lu,"
-          " multicast packets %lu",
+  vty_out (vty, "    input packets %lu, bytes %lu, dropped %lu,"
+          " multicast packets %lu\n",
           ifp->stats.ifi_ipackets, ifp->stats.ifi_ibytes,
           ifp->stats.ifi_iqdrops,ifp->stats.ifi_imcasts);
 

diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 4f19a873b73b69e738c116666ad8e4cd6c24ceea..3c727ecb7259887bb92f73af3576ffef8bd5d1df 100644 (file)
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -478,8 +478,8 @@ DEFUN (ip_irdp_minadvertinterval,
       return CMD_SUCCESS;
   }
   else {
-      vty_outln (vty, "%% MinAdvertInterval must be less than or equal to "
-                      "MaxAdvertInterval");
+      vty_out (vty, "%% MinAdvertInterval must be less than or equal to "
+                      "MaxAdvertInterval\n");
       return CMD_WARNING;
   }
 }
@@ -505,8 +505,8 @@ DEFUN (ip_irdp_maxadvertinterval,
       return CMD_SUCCESS;
   }
   else {
-      vty_outln (vty, "%% MaxAdvertInterval must be greater than or equal to "
-                      "MinAdvertInterval");
+      vty_out (vty, "%% MaxAdvertInterval must be greater than or equal to "
+                      "MinAdvertInterval\n");
       return CMD_WARNING;
   }
 }

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index fc21ada3a42ae85f5b4060dcd0ef2223c187f199..ab1643e50da395c61342121d59b20f711a403a21 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -302,7 +302,7 @@ DEFUN (match_source_protocol,
   i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   return zebra_route_match_add (vty, "source-protocol", proto, RMAP_EVENT_MATCH_ADDED);
@@ -459,7 +459,7 @@ DEFUN (ip_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (proto_rm[AFI_IP][i])
@@ -500,7 +500,7 @@ DEFUN (no_ip_protocol,
 
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
      return CMD_WARNING;
     }
 
@@ -566,7 +566,7 @@ DEFUN (ipv6_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (proto_rm[AFI_IP6][i])
@@ -606,7 +606,7 @@ DEFUN (no_ipv6_protocol,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
      return CMD_WARNING;
     }
   if (!proto_rm[AFI_IP6][i])
@@ -672,7 +672,7 @@ DEFUN (ip_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (nht_rm[AFI_IP][i])
@@ -707,7 +707,7 @@ DEFUN (no_ip_protocol_nht_rmap,
 
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
 
@@ -770,7 +770,7 @@ DEFUN (ipv6_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
   if (nht_rm[AFI_IP6][i])
@@ -801,13 +801,13 @@ DEFUN (no_ipv6_protocol_nht_rmap,
     i = proto_name2num(proto);
   if (i < 0)
     {
-      vty_outln (vty, "invalid protocol name \"%s\"", proto);
+      vty_out (vty, "invalid protocol name \"%s\"\n", proto);
       return CMD_WARNING;
     }
 
   if (nht_rm[AFI_IP6][i] && rmap && strcmp(rmap, nht_rm[AFI_IP6][i]))
     {
-      vty_outln (vty, "invalid route-map \"%s\"", rmap);
+      vty_out (vty, "invalid route-map \"%s\"\n", rmap);
       return CMD_WARNING;
     }
 

diff --git a/zebra/zserv.c b/zebra/zserv.c
index bee70f951706865484a098ec8da9b971100de08f..a89f4f5915aac696cf357c8e598c1692c2d874e6 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -2855,7 +2855,7 @@ DEFUN (show_zebra,
   RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
     {
       struct zebra_vrf *zvrf = vrf->info;
-      vty_outln (vty,"%-25s %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 "",
+      vty_out (vty,"%-25s %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 " %10" PRIu64 "\n",
                vrf->name, zvrf->installs, zvrf->removals,
                zvrf->neigh_updates, zvrf->lsp_installs,zvrf->lsp_removals);
     }