*: remove VTYNL, part 1 of 6

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

14 files changed, 54 insertions, 54 deletions

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 80cd77045..d276de6eb 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -652,7 +652,7 @@ bgp_damp_info_vty (struct vty *vty, struct bgp_info *binfo,
         vty_out (vty, ", reuse in %s",
 	       bgp_get_reuse_time (penalty, timebuf, BGP_UPTIME_LEN, 0, json_path));
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 }
 
@@ -707,7 +707,7 @@ bgp_show_dampening_parameters (struct vty *vty, afi_t afi, safi_t safi)
                (long long)damp->max_suppress_time / 60);
       vty_out (vty, "Max supress penalty: %u\n",
                damp->ceiling);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   else
     vty_out (vty, "dampening not enabled for %s\n",
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 23f49f2c7..b2c91c913 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -254,7 +254,7 @@ bgp_debug_list_print (struct vty *vty, const char *desc, struct list *list)
         }
     }
 
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 }
 
 /* Print the command to enable the debug for each peer/prefix this debug is
@@ -1747,7 +1747,7 @@ DEFUN (show_debugging_bgp,
 
   if (BGP_DEBUG (allow_martians, ALLOW_MARTIANS))
     vty_out (vty, "  BGP allow martian next hop debugging is on\n");
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   return CMD_SUCCESS;
 }
 
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index 9b11cd58b..8968e22b0 100644
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -538,7 +538,7 @@ DEFUN (no_ip_as_path,
 
   if (asfilter == NULL)
     {
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       return CMD_WARNING;
     }
 
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index 979ff6bfe..0a4d589b8 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -703,7 +703,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
                                      rd_vnc_eth.macaddr.octet[4],
                                      rd_vnc_eth.macaddr.octet[5]);
 #endif
-		          vty_out (vty, VTYNL);
+		          vty_out (vty, "\n");
                         }
 		      rd_header = 0;
 		    }
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 3b7f2e2fc..e2d93e9f3 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -444,7 +444,7 @@ bgp_show_nexthops (struct vty *vty, struct bgp *bgp, int detail)
 		}
 	      tbuf = time(NULL) - (bgp_clock() - bnc->last_update);
 	      vty_out (vty, "  Last update: %s", ctime(&tbuf));
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
 	    }
 	}
     }
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 86befd3e8..d6ed441df 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -167,7 +167,7 @@ bgp_capability_vty_out (struct vty *vty, struct peer *peer, u_char use_json, jso
                     vty_out (vty, "SAFI Unknown %d ", mpc.safi);
                   break;
                 }
-              vty_out (vty, VTYNL);
+              vty_out (vty, "\n");
             }
         }
       else if (hdr->code >= 128)
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index c7e26a0a6..b4bdab316 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -6526,7 +6526,7 @@ route_vty_out (struct vty *vty, struct prefix *p,
     }
   else
     {
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 #if ENABLE_BGP_VNC
       /* prints an additional line, indented, with VNC info, if present */
       if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP))
@@ -6663,7 +6663,7 @@ route_vty_out_tmp (struct vty *vty, struct prefix *p, struct attr *attr, safi_t
       json_object_object_add(json_ar, inet_ntop (p->family, &p->u.prefix, buf_cut, BUFSIZ), json_net);
     }
   else
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }  
 
 void
@@ -6767,7 +6767,7 @@ route_vty_out_tag (struct vty *vty, struct prefix *p,
       else
         {
           vty_out (vty, "notag/%d", label);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
     }
 }  
@@ -6855,7 +6855,7 @@ route_vty_out_overlay (struct vty *vty, struct prefix *p,
             }
         }
     }
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 }
 
 /* dampening route */
@@ -6919,7 +6919,7 @@ damp_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
         vty_out (vty, "%s", bgp_origin_str[attr->origin]);
     }
   if (!use_json)
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }
 
 /* flap route */
@@ -7019,7 +7019,7 @@ flap_route_vty_out (struct vty *vty, struct prefix *p, struct bgp_info *binfo,
         vty_out (vty, "%s", bgp_origin_str[attr->origin]);
     }
   if (!use_json)
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }
 
 static void
@@ -7193,7 +7193,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
         }
 
       if (!json_paths)
-        vty_out (vty, VTYNL);
+        vty_out (vty, "\n");
 	  
       /* Line2 display Next-hop, Neighbor, Router-id */
       /* Display the nexthop */
@@ -7343,7 +7343,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
 	}
 
       if (!json_paths)
-        vty_out (vty, VTYNL);
+        vty_out (vty, "\n");
 
       /* display the link-local nexthop */
       if (attr->extra && attr->extra->mp_nexthop_len == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL)
@@ -7562,7 +7562,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
         json_object_object_add(json_path, "bestpath", json_bestpath);
 
       if (!json_paths)
-        vty_out (vty, VTYNL);
+        vty_out (vty, "\n");
 	  
       /* Line 4 display Community */
       if (attr->community)
@@ -7649,7 +7649,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
 	    }
 
           if (!json_paths)
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	}
 
       if (binfo->extra && binfo->extra->damp_info)
@@ -7724,7 +7724,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
             {
               if (!first)
                 {
-	          vty_out (vty, VTYNL);
+	          vty_out (vty, "\n");
                 }
             }
         }
@@ -7764,7 +7764,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
       json_object_array_add(json_paths, json_path);
     }
   else
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }
 
 #define BGP_SHOW_HEADER_CSV "Flags, Network, Next Hop, Metric, LocPrf, Weight, Path"
@@ -8249,7 +8249,7 @@ route_vty_out_detail_header (struct vty *vty, struct bgp *bgp,
         {
           if (first)
             vty_out (vty, "  Not advertised to any peer");
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
     }
 }
@@ -9245,7 +9245,7 @@ bgp_table_stats (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi)
             vty_out (vty, "%12llu", ts.counts[i]);
         }
         
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   return CMD_SUCCESS;
 }
@@ -10672,7 +10672,7 @@ bgp_config_write_network_vpn (struct vty *vty, struct bgp *bgp,
                 if (bgp_static->backdoor)
                   vty_out (vty, " backdoor");
               }
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	  }
   return 0;
 }
@@ -10719,7 +10719,7 @@ bgp_config_write_network_evpn (struct vty *vty, struct bgp *bgp,
 	    vty_out (vty, " network %s rd %s ethtag %u tag %u esi %s gwip %s routermac %s",
 		     buf, rdbuf, p->u.prefix_evpn.eth_tag,
                      decode_label (&bgp_static->label), esi, buf2 , macrouter);
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
             if (macrouter)
               XFREE (MTYPE_TMP, macrouter);
             if (esi)
@@ -10794,7 +10794,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp,
 	      vty_out (vty, " backdoor");
           }
 
-	vty_out (vty, VTYNL);
+	vty_out (vty, "\n");
       }
 
   /* Aggregate-address configuration. */
@@ -10828,7 +10828,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp,
 	if (bgp_aggregate->summary_only)
 	  vty_out (vty, " summary-only");
 
-	vty_out (vty, VTYNL);
+	vty_out (vty, "\n");
       }
 
   return 0;
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index fac446a79..b8971dcd6 100644
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -584,7 +584,7 @@ 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_out (vty, "\n");
     vty_out (vty, "  Update-subgroup %" PRIu64 ":\n", subgrp->id);
     vty_out (vty, "    Created: %s", timestamp_string (subgrp->uptime));
 
diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
index e829c9cf2..e1fed31a1 100644
--- a/bgpd/bgp_vpn.c
+++ b/bgpd/bgp_vpn.c
@@ -170,7 +170,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd,
                                      rd_vnc_eth.macaddr.octet[5]);
 #endif
 
-                          vty_out (vty, VTYNL);
+                          vty_out (vty, "\n");
                         }
                       rd_header = 0;
                     }
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index ca948b2f1..2dd81d407 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6626,7 +6626,7 @@ bgp_config_write_peer_global (struct vty *vty, struct bgp *bgp,
           if_ras_printed = TRUE;
         }
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   /* remote-as and peer-group */
@@ -7016,7 +7016,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
 	vty_out (vty, " send");
       else
 	vty_out (vty, " receive");
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   /* Route reflector client. */
@@ -7163,7 +7163,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
                           "  neighbor %s default-originate", addr);
       if (peer->default_rmap[afi][safi].name)
 	vty_out (vty, " route-map %s", peer->default_rmap[afi][safi].name);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   /* Soft reconfiguration inbound. */
@@ -7191,7 +7191,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
 	  vty_out (vty, " warning-only");
 	if (peer->pmax_restart[afi][safi])
 	  vty_out (vty, " restart %u", peer->pmax_restart[afi][safi]);
-	vty_out (vty, VTYNL);
+	vty_out (vty, "\n");
       }
 
   /* Route server client. */
@@ -7329,7 +7329,7 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
       if (safi == SAFI_EVPN)
 	vty_out (vty, "l2vpn evpn");
     }
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   *write = 1;
 }
@@ -7416,7 +7416,7 @@ bgp_config_write (struct vty *vty)
                      (bgp->inst_type == BGP_INSTANCE_TYPE_VIEW) ?
                      "view" : "vrf", bgp->name);
 	}
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       /* No Synchronization */
       if (bgp_option_check (BGP_OPT_CONFIG_CISCO))
@@ -7487,7 +7487,7 @@ bgp_config_write (struct vty *vty)
          for (i = 0; i < bgp->confed_peers_cnt; i++)
            vty_out(vty, " %u", bgp->confed_peers[i]);
 
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
 	}
 
       /* BGP enforce-first-as. */
@@ -7508,14 +7508,14 @@ bgp_config_write (struct vty *vty)
           vty_out (vty, " bgp max-med on-startup %u", bgp->v_maxmed_onstartup);
           if (bgp->maxmed_onstartup_value != BGP_MAXMED_VALUE_DEFAULT)
             vty_out (vty, " %u", bgp->maxmed_onstartup_value);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
       if (bgp->v_maxmed_admin != BGP_MAXMED_ADMIN_UNCONFIGURED)
         {
           vty_out (vty, " bgp max-med administrative");
           if (bgp->maxmed_admin_value != BGP_MAXMED_VALUE_DEFAULT)
             vty_out (vty, " %u", bgp->maxmed_admin_value);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
 
       /* write quanta */
@@ -7570,7 +7570,7 @@ bgp_config_write (struct vty *vty)
 	    vty_out (vty, " confed");
 	  if (bgp_flag_check (bgp, BGP_FLAG_MED_MISSING_AS_WORST))
 	    vty_out (vty, " missing-as-worst");
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 	}
 
       /* BGP network import check. */
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index 233734f14..495765ba6 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -2620,7 +2620,7 @@ bgp_rfapi_delete_nve_group (
             vty_out (vty, " un=");
           rfapiPrintRfapiIpAddr (vty, &rfd->un_addr);
           if (vty)
-            vty_out (vty, VTYNL);
+            vty_out (vty, "\n");
         }
       list_delete (orphaned_nves);
     }
@@ -4459,7 +4459,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
                   {
                     vty_out (vty, "%hu ", (uint16_t) ((uintptr_t) data));
                   }
-                vty_out (vty, VTYNL);
+                vty_out (vty, "\n");
               }
 
             if (rfg->rt_import_list && rfg->rt_export_list &&
@@ -4546,7 +4546,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
               vty_out (vty, "%d", hc->default_response_lifetime);
             else
               vty_out (vty, "infinite");
-            vty_out (vty, VTYNL);
+            vty_out (vty, "\n");
           }
         if (hc->default_rt_import_list && hc->default_rt_export_list &&
             ecommunity_cmp (hc->default_rt_import_list,
@@ -4661,7 +4661,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp)
               vty_out (vty, "%d", rfg->response_lifetime);
             else
               vty_out (vty, "infinite");
-            vty_out (vty, VTYNL);
+            vty_out (vty, "\n");
           }
 
         if (rfg->rt_import_list && rfg->rt_export_list &&
@@ -5031,7 +5031,7 @@ bgp_rfapi_show_summary (struct bgp *bgp, struct vty *vty)
            (hc->rfp_cfg.ftd_advertisement_interval == RFAPI_RFP_CFG_DEFAULT_FTD_ADVERTISEMENT_INTERVAL ? "(default)" : ""));
   vty_out (vty, "%-39s %d seconds\n", "Default RFP response lifetime:",
            hc->default_response_lifetime);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   return;
 }
 
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 9cb6ccbd9..2137aaad3 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -2516,7 +2516,7 @@ register_add (
          }
 
        vnc_zlog_debug_verbose ("%s: rfapi_register failed", __func__);
-       vty_out (vty, VTYNL);
+       vty_out (vty, "\n");
        vty_out (vty, "Registration failed.\n");
        vty_out (vty,
                 "Confirm that either the VN or UN address matches a configured NVE group.\n");
@@ -4459,10 +4459,10 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
                        h->stat.count_registrations_failed);
               vty_out (vty, "%-8s %-8u", "Total:",
                        h->stat.count_registrations);
-              vty_out (vty, VTYNL);
+              vty_out (vty, "\n");
             }
           vty_out (vty, "%-24s ", "Prefixes registered:");
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
 
           rfapiCountAllItRoutes (&active_local_routes,
                                  &active_remote_routes,
@@ -4474,16 +4474,16 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
             {
               vty_out (vty, "    %-20s ", "Locally:");
               vty_out (vty, "%-8s %-8u ", "Active:", active_local_routes);
-              vty_out (vty, VTYNL);
+              vty_out (vty, "\n");
             }
 
 
           vty_out (vty, "    %-20s ", "Remotely:");
           vty_out (vty, "%-8s %-8u", "Active:", active_remote_routes);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
           vty_out (vty, "    %-20s ", "In Holddown:");
           vty_out (vty, "%-8s %-8u", "Active:", holddown_remote_routes);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
           vty_out (vty, "    %-20s ", "Imported:");
           vty_out (vty, "%-8s %-8u", "Active:", imported_remote_routes);
           break;
@@ -4502,7 +4502,7 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type)
         default:
           break;
         }
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   return 0;
 
@@ -4616,7 +4616,7 @@ DEFUN (vnc_show_summary,
   if (!check_and_display_is_vnc_running (vty))
     return CMD_SUCCESS;
   bgp_rfapi_show_summary (bgp_get_default (), vty);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_ACTIVE_NVES);
   rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_QUERIES);
   rfapi_vty_show_nve_summary (vty, SHOW_NVE_SUMMARY_RESPONSES);
@@ -4713,7 +4713,7 @@ rfapi_show_registrations (
     }
   if (!printed)
     {
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 }
 
diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index 58b762a63..21627a20a 100644
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -173,7 +173,7 @@ DEFUN (show_debugging_bgp_vnc,
 	    vncdebug[i].name);
 	}
     }
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   return CMD_SUCCESS;
 }
 
diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c
index a0ba82908..451be7770 100644
--- a/bgpd/rfp-example/librfp/rfp_example.c
+++ b/bgpd/rfp-example/librfp/rfp_example.c
@@ -197,7 +197,7 @@ rfp_cfg_write_cb (struct vty *vty, void *rfp_start_val)
   if (rfi->config_var != 0)
     {
       vty_out (vty, " rfp example-config-value %u", rfi->config_var);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       write++;
     }