*: remove VTYNL, part 1 of 6

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

7 files changed, 33 insertions, 33 deletions

diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index 513a3871c..e4a4e0c42 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -402,13 +402,13 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
       else
 	vty_out (vty, "-        ");
       vty_out (vty, "%-10s", snpa_print (adj->snpa));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   if (detail == ISIS_UI_LEVEL_DETAIL)
     {
       level = adj->level;
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       if (adj->circuit)
 	vty_out (vty, "    Interface: %s", adj->circuit->interface->name);
       else
@@ -421,13 +421,13 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
 		 time2string (adj->last_upd + adj->hold_time - now));
       else
 	vty_out (vty, ", Expires in %s", time2string (adj->hold_time));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       vty_out (vty, "    Adjacency flaps: %u", adj->flaps);
       vty_out (vty, ", Last: %s ago", time2string (now - adj->last_flap));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       vty_out (vty, "    Circuit type: %s", circuit_t2string (adj->circuit_t));
       vty_out (vty, ", Speaks: %s", nlpid2string (&adj->nlpids));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       if (adj->mt_count != 1 || adj->mt_set[0] != ISIS_MT_IPV4_UNICAST)
         {
           vty_out (vty, "    Topologies:\n");
@@ -445,7 +445,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
           vty_out (vty, ", LAN id: %s.%02x",
               sysid_print (adj->lanid), adj->lanid[ISIS_SYS_ID_LEN]);
 
-        vty_out (vty, VTYNL);
+        vty_out (vty, "\n");
         vty_out (vty, "    LAN Priority: %u", adj->prio[adj->level - 1]);
 
         vty_out (vty, ", %s, DIS flaps: %u, Last: %s ago",
@@ -455,7 +455,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
               (adj->dis_record[ISIS_LEVELS + level - 1].
                last_dis_change)));
       }
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       if (adj->area_addrs && listcount (adj->area_addrs) > 0)
         {
@@ -480,7 +480,7 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty *vty, char detail)
 	      vty_out (vty, "      %s\n", ip6);
 	    }
 	}
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   return;
 }
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index aeaedbe3e..d07ea27c4 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -878,7 +878,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
       vty_out (vty, "%-9s", circuit_state2string (circuit->state));
       vty_out (vty, "%-9s", circuit_type2string (circuit->circ_type));
       vty_out (vty, "%-9s", circuit_t2string (circuit->is_type));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   if (detail == ISIS_UI_LEVEL_DETAIL)
@@ -894,12 +894,12 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
       else
         vty_out (vty, ", Active");
       vty_out (vty, ", Circuit Id: 0x%x", circuit->circuit_id);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       vty_out (vty, "    Type: %s", circuit_type2string (circuit->circ_type));
       vty_out (vty, ", Level: %s", circuit_t2string (circuit->is_type));
       if (circuit->circ_type == CIRCUIT_T_BROADCAST)
         vty_out (vty, ", SNPA: %-10s", snpa_print (circuit->u.bc.snpa));
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       if (circuit->is_type & IS_LEVEL_1)
         {
           vty_out (vty, "    Level-1 Information:\n");
@@ -928,7 +928,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
             }
           else
             {
-              vty_out (vty, VTYNL);
+              vty_out (vty, "\n");
             }
         }
       if (circuit->is_type & IS_LEVEL_2)
@@ -959,7 +959,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
             }
           else
             {
-              vty_out (vty, VTYNL);
+              vty_out (vty, "\n");
             }
         }
       if (circuit->ip_addrs && listcount (circuit->ip_addrs) > 0)
@@ -990,7 +990,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty,
             }
         }
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   return;
 }
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index c320ff79a..ed376058b 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -1079,7 +1079,7 @@ lsp_print_detail (struct isis_lsp *lsp, struct vty *vty, char dynhost)
   for (ALL_LIST_ELEMENTS_RO (lsp->tlv_data.mt_ipv4_reachs, lnode, mt_ipv4_reachs))
     lsp_print_mt_ipv4_reach(mt_ipv4_reachs->list, vty, mt_ipv4_reachs->mtid);
 
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   return;
 }
diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index f4af3aef2..9846686ef 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -796,7 +796,7 @@ isis_redist_config_write(struct vty *vty, struct isis_area *area,
             vty_out(vty, " metric %u", redist->metric);
           if (redist->map_name)
             vty_out(vty, " route-map %s", redist->map_name);
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
           write++;
         }
     }
@@ -814,7 +814,7 @@ isis_redist_config_write(struct vty *vty, struct isis_area *area,
         vty_out(vty, " metric %u", redist->metric);
       if (redist->map_name)
         vty_out(vty, " route-map %s", redist->map_name);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       write++;
     }
 
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index a85cef640..4b5592c15 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1336,7 +1336,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
 	for (ALL_LIST_ELEMENTS_RO (vertex->Adj_N, anode, adj)) {
 	  if (adj) {
 	    if (rows) {
-		vty_out (vty, VTYNL);
+		vty_out (vty, "\n");
 		vty_out (vty, "%-20s %-12s %-6s ", "", "", "");
 	    }
 	    vty_out (vty, "%-20s %-9s ",
@@ -1356,7 +1356,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
 	int rows = 0;
 	for (ALL_LIST_ELEMENTS_RO (vertex->parents, pnode, pvertex)) {
 	  if (rows) {
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	    vty_out (vty, "%-72s", "");
 	  }
 	  vty_out (vty, "%s(%d)",
@@ -1367,7 +1367,7 @@ isis_print_paths (struct vty *vty, struct list *paths, u_char *root_sysid)
 	vty_out (vty, "  NULL ");
       }
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 }
 
@@ -1409,7 +1409,7 @@ DEFUN (show_isis_topology,
 	      vty_out (vty, "IS-IS paths to level-%d routers that speak IP\n",
 		       level);
 	      isis_print_paths (vty, area->spftree[level-1]->paths, isis->sysid);
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
 	    }
 	  if (area->ipv6_circuits > 0 && area->spftree6[level-1]
 	      && area->spftree6[level-1]->paths->count > 0)
@@ -1418,11 +1418,11 @@ DEFUN (show_isis_topology,
 		       "IS-IS paths to level-%d routers that speak IPv6\n",
 		       level);
 	      isis_print_paths (vty, area->spftree6[level-1]->paths, isis->sysid);
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
 	    }
 	}
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   return CMD_SUCCESS;
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index 613fe8e4f..47377bd7a 100644
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -974,7 +974,7 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh)
               else
                 rtn++;
             }
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
       else
         vty_out (vty, "    Unknown TLV: [type(%#.2x), length(%#.2x)]\n",
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 7436d9f93..f64f98a7d 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1374,7 +1374,7 @@ DEFUN (show_isis_summary,
 
   vty_out (vty, "Up time         : ");
   vty_out_timestr(vty, isis->uptime);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   if (isis->area_list)
     vty_out (vty, "Number of areas : %d\n",isis->area_list->count);
@@ -1409,12 +1409,12 @@ DEFUN (show_isis_summary,
           area->min_spf_interval[level - 1]);
       if (area->spf_delay_ietf[level - 1])
          vty_out (vty, " (not used, IETF SPF delay activated)");
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       vty_out (vty, "    IPv4 route computation:\n");
       vty_out (vty, "      last run elapsed  : ");
       vty_out_timestr(vty, spftree->last_run_timestamp);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       vty_out (vty, "      last run duration : %u usec\n",
                (u_int32_t)spftree->last_run_duration);
@@ -1427,7 +1427,7 @@ DEFUN (show_isis_summary,
 
       vty_out (vty, "      last run elapsed  : ");
       vty_out_timestr(vty, spftree->last_run_timestamp);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       vty_out (vty, "      last run duration : %llu msec\n",
                (unsigned long long)spftree->last_run_duration);
@@ -1436,7 +1436,7 @@ DEFUN (show_isis_summary,
           spftree->runcount);
     }
   }
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   return CMD_SUCCESS;
 }
@@ -2174,7 +2174,7 @@ isis_config_write (struct vty *vty)
 		else
 		  vty_out(vty, "send-only");
 	      }
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	    write++; 
 	  }
         else if (area->area_passwd.type == ISIS_PASSWD_TYPE_CLEARTXT)
@@ -2188,7 +2188,7 @@ isis_config_write (struct vty *vty)
 		else
 		  vty_out(vty, "send-only");
 	      }
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	    write++; 
           }
 	if (area->domain_passwd.type == ISIS_PASSWD_TYPE_HMAC_MD5)
@@ -2203,7 +2203,7 @@ isis_config_write (struct vty *vty)
 		else
 		  vty_out(vty, "send-only");
 	      }
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	    write++;
 	  }
         else if (area->domain_passwd.type == ISIS_PASSWD_TYPE_CLEARTXT)
@@ -2218,7 +2218,7 @@ isis_config_write (struct vty *vty)
 		else
 		  vty_out(vty, "send-only");
 	      }
-	    vty_out (vty, VTYNL);
+	    vty_out (vty, "\n");
 	    write++;
 	  }