*: remove VTYNL, part 1 of 6

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

9 files changed, 40 insertions, 40 deletions

diff --git a/lib/bfd.c b/lib/bfd.c
index f429ef3e7a..4fbb93ebd4 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -461,7 +461,7 @@ bfd_show_info(struct vty *vty, struct bfd_info *bfd_info, int multihop,
   if (use_json)
     json_object_object_add(json_obj, "peerBfdInfo", json_bfd);
   else
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }
 
 /*
diff --git a/lib/command.c b/lib/command.c
index fb560cb614..ad197468a5 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -463,7 +463,7 @@ config_write_host (struct vty *vty)
       if (zlog_default->maxlvl[ZLOG_DEST_FILE] != zlog_default->default_lvl)
         vty_out (vty, " %s",
                  zlog_priority[zlog_default->maxlvl[ZLOG_DEST_FILE]]);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   if (zlog_default->maxlvl[ZLOG_DEST_STDOUT] != ZLOG_DISABLED)
@@ -472,7 +472,7 @@ config_write_host (struct vty *vty)
       if (zlog_default->maxlvl[ZLOG_DEST_STDOUT] != zlog_default->default_lvl)
         vty_out (vty, " %s",
                  zlog_priority[zlog_default->maxlvl[ZLOG_DEST_STDOUT]]);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   if (zlog_default->maxlvl[ZLOG_DEST_MONITOR] == ZLOG_DISABLED)
@@ -487,7 +487,7 @@ config_write_host (struct vty *vty)
       if (zlog_default->maxlvl[ZLOG_DEST_SYSLOG] != zlog_default->default_lvl)
         vty_out (vty, " %s",
                  zlog_priority[zlog_default->maxlvl[ZLOG_DEST_SYSLOG]]);
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
 
   if (zlog_default->facility != LOG_DAEMON)
@@ -1421,7 +1421,7 @@ permute (struct graph_node *start, struct vty *vty)
       }
       if (gn == start)
         vty_out (vty, "...");
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
     else
     {
@@ -2012,7 +2012,7 @@ DEFUN (show_logging,
     vty_out (vty, "level %s, facility %s, ident %s",
              zlog_priority[zl->maxlvl[ZLOG_DEST_SYSLOG]],
              facility_name(zl->facility), zl->ident);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   vty_out (vty, "Stdout logging: ");
   if (zl->maxlvl[ZLOG_DEST_STDOUT] == ZLOG_DISABLED)
@@ -2020,7 +2020,7 @@ DEFUN (show_logging,
   else
     vty_out (vty, "level %s",
              zlog_priority[zl->maxlvl[ZLOG_DEST_STDOUT]]);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   vty_out (vty, "Monitor logging: ");
   if (zl->maxlvl[ZLOG_DEST_MONITOR] == ZLOG_DISABLED)
@@ -2028,7 +2028,7 @@ DEFUN (show_logging,
   else
     vty_out (vty, "level %s",
              zlog_priority[zl->maxlvl[ZLOG_DEST_MONITOR]]);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   vty_out (vty, "File logging: ");
   if ((zl->maxlvl[ZLOG_DEST_FILE] == ZLOG_DISABLED) ||
@@ -2038,7 +2038,7 @@ DEFUN (show_logging,
     vty_out (vty, "level %s, filename %s",
              zlog_priority[zl->maxlvl[ZLOG_DEST_FILE]],
              zl->filename);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   vty_out (vty, "Protocol name: %s\n",
            zl->protoname);
diff --git a/lib/distribute.c b/lib/distribute.c
index 8bf961e97e..691b67e83f 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -393,7 +393,7 @@ config_show_distribute (struct vty *vty)
                                    DISTRIBUTE_V6_OUT, has_print);
     }
   if (has_print)
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
   else
     vty_out (vty, " not set\n");
 
@@ -414,7 +414,7 @@ config_show_distribute (struct vty *vty)
             has_print = distribute_print(vty, dist->prefix, 1,
                                          DISTRIBUTE_V6_OUT, has_print);
             if (has_print)
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
             else
               vty_out (vty, " nothing\n");
 	    }
@@ -437,7 +437,7 @@ config_show_distribute (struct vty *vty)
                                    DISTRIBUTE_V6_IN, has_print);
     }
   if (has_print)
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
   else
     vty_out (vty, " not set\n");
 
@@ -458,7 +458,7 @@ config_show_distribute (struct vty *vty)
             has_print = distribute_print(vty, dist->prefix, 1,
                                          DISTRIBUTE_V6_IN, has_print);
             if (has_print)
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
             else
               vty_out (vty, " nothing\n");
 	    }
diff --git a/lib/filter.c b/lib/filter.c
index ae4b0b3b0c..9967308f66 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -1727,7 +1727,7 @@ filter_show (struct vty *vty, const char *name, afi_t afi)
 		  vty_out (vty, " %s", inet_ntoa (filter->addr));
 		  if (filter->addr_mask.s_addr != 0)
 		    vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
-		  vty_out (vty, VTYNL);
+		  vty_out (vty, "\n");
 		}
 	    }
 	}
@@ -1770,7 +1770,7 @@ filter_show (struct vty *vty, const char *name, afi_t afi)
 		  vty_out (vty, " %s", inet_ntoa (filter->addr));
 		  if (filter->addr_mask.s_addr != 0)
 		    vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
-		  vty_out (vty, VTYNL);
+		  vty_out (vty, "\n");
 		}
 	    }
 	}
@@ -1855,7 +1855,7 @@ config_write_access_cisco (struct vty *vty, struct filter *mfilter)
 	  vty_out (vty, " %s", inet_ntoa (filter->mask));
 	  vty_out (vty, " %s", inet_ntoa (filter->mask_mask));
 	}
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
     }
   else
     {
@@ -1866,7 +1866,7 @@ config_write_access_cisco (struct vty *vty, struct filter *mfilter)
 	  vty_out (vty, " %s", inet_ntoa (filter->addr));
 	  if (filter->addr_mask.s_addr != 0)
 	    vty_out (vty, " %s", inet_ntoa (filter->addr_mask));
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 	}
     }
 }
@@ -1889,7 +1889,7 @@ config_write_access_zebra (struct vty *vty, struct filter *mfilter)
 	     p->prefixlen,
 	     filter->exact ? " exact-match" : "");
 
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 }
 
 static int
diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index c3e1898f10..edf55fba99 100644
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -418,14 +418,14 @@ DEFUN (grammar_findambig,
                        prev->el->string);
             vty_out (vty, "  %s%s   '%s'\n", cur->el->name,  VTYNL,
                        cur->el->string);
-            vty_out (vty, VTYNL);
+            vty_out (vty, "\n");
             ambig++;
           }
         prev = cur;
       }
     list_delete (commands);
 
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
   } while (scan && scannode < LINK_PARAMS_NODE);
 
   vty_out (vty, "%d ambiguous commands found.\n", ambig);
@@ -543,7 +543,7 @@ pretty_print_graph (struct vty *vty, struct graph_node *start, int level,
   if (numto)
     {
       if (numto > 1)
-        vty_out (vty, VTYNL);
+        vty_out (vty, "\n");
       for (unsigned int i = 0; i < vector_active (start->to); i++)
         {
           struct graph_node *adj = vector_slot (start->to, i);
@@ -569,7 +569,7 @@ pretty_print_graph (struct vty *vty, struct graph_node *start, int level,
        }
     }
   else
-    vty_out (vty, VTYNL);
+    vty_out (vty, "\n");
 }
 
 static void
diff --git a/lib/keychain.c b/lib/keychain.c
index aaa8178c88..9b7b0877e4 100644
--- a/lib/keychain.c
+++ b/lib/keychain.c
@@ -990,7 +990,7 @@ keychain_config_write (struct vty *vty)
 		  keychain_strftime (buf, BUFSIZ, &key->accept.end);
 		  vty_out (vty, " %s", buf);
 		}
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
 	    }
 
 	  if (key->send.start)
@@ -1007,7 +1007,7 @@ keychain_config_write (struct vty *vty)
 		  keychain_strftime (buf, BUFSIZ, &key->send.end);
 		  vty_out (vty, " %s", buf);
 		}
-	      vty_out (vty, VTYNL);
+	      vty_out (vty, "\n");
 	    }
 	}
       vty_out (vty, "!\n");
diff --git a/lib/plist.c b/lib/plist.c
index 9f20a412e9..3a9d26064d 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -1234,7 +1234,7 @@ vty_show_prefix_entry (struct vty *vty, afi_t afi, struct prefix_list *plist,
 	    vty_out (vty, " (hit count: %ld, refcount: %ld)", 
 		     pentry->hitcnt, pentry->refcnt);
 	  
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 	}
     }
 }
@@ -1346,7 +1346,7 @@ vty_show_prefix_list_prefix (struct vty *vty, afi_t afi, const char *name,
 	    vty_out (vty, " (hit count: %ld, refcount: %ld)", 
 		     pentry->hitcnt, pentry->refcnt);
 
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 
 	  if (type == first_match_display)
 	    return CMD_SUCCESS;
@@ -1858,7 +1858,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
 	      if (pentry->le)
 		vty_out (vty, " le %d", pentry->le);
 	    }
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 	  write++;
 	}
       /* vty_out (vty, "!%s", VTYNL); */
@@ -1901,7 +1901,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty)
 	      if (pentry->le)
 		vty_out (vty, " le %d", pentry->le);
 	    }
-	  vty_out (vty, VTYNL);
+	  vty_out (vty, "\n");
 	  write++;
 	}
     }
@@ -2071,7 +2071,7 @@ prefix_bgp_show_prefix_list (struct vty *vty, afi_t afi, char *name, u_char use_
           if (pentry->le)
             vty_out (vty, " le %d", pentry->le);
 
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
         }
     }
   return plist->count;
diff --git a/lib/thread.c b/lib/thread.c
index 10727dd078..df524d4aed 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -147,7 +147,7 @@ cpu_record_print(struct vty *vty, thread_type filter)
       memset (underline, '-', sizeof (underline));
       underline[sizeof(underline)] = '\0';
 
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
       vty_out(vty, "Showing statistics for pthread %s\n", name);
       vty_out(vty, "-------------------------------%s\n", underline);
       vty_out(vty, "%21s %18s %18s\n", "", "CPU (user+system):", "Real (wall-clock):");
diff --git a/lib/vty.c b/lib/vty.c
index 8ff8280d48..0c7a5524c9 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -714,7 +714,7 @@ vty_backward_word (struct vty *vty)
 static void
 vty_down_level (struct vty *vty)
 {
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   cmd_exit (vty);
   vty_prompt (vty);
   vty->cp = 0;
@@ -724,7 +724,7 @@ vty_down_level (struct vty *vty)
 static void
 vty_end_config (struct vty *vty)
 {
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   switch (vty->node)
     {
@@ -929,7 +929,7 @@ vty_complete_command (struct vty *vty)
 
   cmd_free_strvec (vline);
 
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
   switch (ret)
     {
     case CMD_ERR_AMBIGUOUS:
@@ -969,11 +969,11 @@ vty_complete_command (struct vty *vty)
       for (i = 0; matched[i] != NULL; i++)
         {
           if (i != 0 && ((i % 6) == 0))
-            vty_out (vty, VTYNL);
+            vty_out (vty, "\n");
           vty_out (vty, "%-10s ", matched[i]);
           XFREE (MTYPE_COMPLETION, matched[i]);
         }
-      vty_out (vty, VTYNL);
+      vty_out (vty, "\n");
 
       vty_prompt (vty);
       vty_redraw_line (vty);
@@ -1052,7 +1052,7 @@ vty_describe_command (struct vty *vty)
 
   describe = cmd_describe_command (vline, vty, &ret);
 
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   /* Ambiguous error. */
   switch (ret)
@@ -1125,7 +1125,7 @@ vty_describe_command (struct vty *vty)
                     vty_out(vty, " %s", item);
                     XFREE(MTYPE_COMPLETION, item);
                   }
-                vty_out (vty, VTYNL);
+                vty_out (vty, "\n");
               }
             vector_free(varcomps);
           }
@@ -1170,7 +1170,7 @@ vty_stop_input (struct vty *vty)
 {
   vty->cp = vty->length = 0;
   vty_clear_buf (vty);
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
   switch (vty->node)
     {
@@ -1294,7 +1294,7 @@ vty_telnet_option (struct vty *vty, unsigned char *buf, int nbytes)
           break;
         }
     }
-  vty_out (vty, VTYNL);
+  vty_out (vty, "\n");
 
 #endif /* TELNET_OPTION_DEBUG */
 
@@ -1590,7 +1590,7 @@ vty_read (struct thread *thread)
           break;
         case '\n':
         case '\r':
-          vty_out (vty, VTYNL);
+          vty_out (vty, "\n");
           vty_execute (vty);
           break;
         case '\t':