*: remove VTYNL, part 4 of 6

[mirror_frr.git] / ospf6d / ospf6_area.c

diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index 7ee5c9b6e4e91a6cee698f90a5856b3f09f045ba..102eb5e0e16e36fef0cbb6e981d0336833f73010 100644 (file)
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -371,20 +371,20 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   unsigned long result;
 
   if (!IS_AREA_STUB (oa))
-    vty_out (vty, " Area %s%s", oa->name, VTYNL);
+    vty_out (vty, " Area %s\n", oa->name);
   else
     {
       if (oa->no_summary)
        {
-         vty_out (vty, " Area %s[Stub, No Summary]%s", oa->name, VTYNL);
+         vty_out (vty, " Area %s[Stub, No Summary]\n", oa->name);
        }
       else
        {
-         vty_out (vty, " Area %s[Stub]%s", oa->name, VTYNL);
+         vty_out (vty, " Area %s[Stub]\n", oa->name);
        }
     }
-  vty_out (vty, "     Number of Area scoped LSAs is %u%s",
-           oa->lsdb->count, VTYNL);
+  vty_out (vty, "     Number of Area scoped LSAs is %u\n",
+           oa->lsdb->count);
 
   vty_out (vty, "     Interface attached to this area:");
   for (ALL_LIST_ELEMENTS_RO (oa->if_list, i, oi))
@@ -417,7 +417,7 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
   u_int32_t area_id = htonl (strtoul (str, &ep, 10));      \
   if (*ep && inet_pton (AF_INET, str, &area_id) != 1)      \
     {                                                      \
-      vty_out (vty, "Malformed Area-ID: %s%s", str, VTYNL);  \
+      vty_out (vty, "Malformed Area-ID: %s\n", str);  \
       return CMD_SUCCESS;                                  \
     }                                                      \
   int format = !*ep ? OSPF6_AREA_FMT_DECIMAL :             \
@@ -454,7 +454,7 @@ DEFUN (area_range,
   ret = str2prefix (argv[idx_ipv6_prefixlen]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6_prefixlen]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[idx_ipv6_prefixlen]->arg);
       return CMD_SUCCESS;
     }
 
@@ -528,14 +528,14 @@ DEFUN (no_area_range,
   ret = str2prefix (argv[idx_ipv6]->arg, &prefix);
   if (ret != 1 || prefix.family != AF_INET6)
     {
-      vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6]->arg, VTYNL);
+      vty_out (vty, "Malformed argument: %s\n", argv[idx_ipv6]->arg);
       return CMD_SUCCESS;
     }
 
   range = ospf6_route_lookup (&prefix, oa->range_table);
   if (range == NULL)
     {
-      vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv6]->arg, VTYNL);
+      vty_out (vty, "Range %s does not exists.\n", argv[idx_ipv6]->arg);
       return CMD_SUCCESS;
     }
 
@@ -589,22 +589,22 @@ ospf6_area_config_write (struct vty *vty)
       if (IS_AREA_STUB (oa))
        {
          if (oa->no_summary)
-           vty_out (vty, " area %s stub no-summary%s", oa->name, VTYNL);
+           vty_out (vty, " area %s stub no-summary\n", oa->name);
          else
-           vty_out (vty, " area %s stub%s", oa->name, VTYNL);
+           vty_out (vty, " area %s stub\n", oa->name);
        }
       if (PREFIX_NAME_IN (oa))
-        vty_out (vty, " area %s filter-list prefix %s in%s",
-                 oa->name, PREFIX_NAME_IN (oa), VTYNL);
+        vty_out (vty, " area %s filter-list prefix %s in\n",
+                 oa->name, PREFIX_NAME_IN (oa));
       if (PREFIX_NAME_OUT (oa))
-        vty_out (vty, " area %s filter-list prefix %s out%s",
-                 oa->name, PREFIX_NAME_OUT (oa), VTYNL);
+        vty_out (vty, " area %s filter-list prefix %s out\n",
+                 oa->name, PREFIX_NAME_OUT (oa));
       if (IMPORT_NAME (oa))
-        vty_out (vty, " area %s import-list %s%s",
-                 oa->name, IMPORT_NAME (oa), VTYNL);
+        vty_out (vty, " area %s import-list %s\n",
+                 oa->name, IMPORT_NAME (oa));
       if (EXPORT_NAME (oa))
-        vty_out (vty, " area %s export-list %s%s",
-                 oa->name, EXPORT_NAME (oa), VTYNL);
+        vty_out (vty, " area %s export-list %s\n",
+                 oa->name, EXPORT_NAME (oa));
     }
 }
 
@@ -831,8 +831,8 @@ DEFUN (show_ipv6_ospf6_spf_tree,
       route = ospf6_route_lookup (&prefix, oa->spf_table);
       if (route == NULL)
         {
-          vty_out (vty, "LS entry for root not found in area %s%s",
-                   oa->name, VTYNL);
+          vty_out (vty, "LS entry for root not found in area %s\n",
+                   oa->name);
           continue;
         }
       root = (struct ospf6_vertex *) route->route_option;
@@ -866,21 +866,21 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
 
   if (inet_pton (AF_INET, argv[idx_ipv4]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "Malformed Area-ID: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4]->arg, VTYNL);
+      vty_out (vty, "No such Area: %s\n", argv[idx_ipv4]->arg);
       return CMD_SUCCESS;
     }
 
   route = ospf6_route_lookup (&prefix, oa->spf_table);
   if (route == NULL)
     {
-      vty_out (vty, "LS entry for root not found in area %s%s",
-               oa->name, VTYNL);
+      vty_out (vty, "LS entry for root not found in area %s\n",
+               oa->name);
       return CMD_SUCCESS;
     }
   root = (struct ospf6_vertex *) route->route_option;
@@ -919,13 +919,13 @@ DEFUN (show_ipv6_ospf6_simulate_spf_tree_root,
 
   if (inet_pton (AF_INET, argv[idx_ipv4_2]->arg, &area_id) != 1)
     {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
+      vty_out (vty, "Malformed Area-ID: %s\n", argv[idx_ipv4_2]->arg);
       return CMD_SUCCESS;
     }
   oa = ospf6_area_lookup (area_id, ospf6);
   if (oa == NULL)
     {
-      vty_out (vty, "No such Area: %s%s", argv[idx_ipv4_2]->arg, VTYNL);
+      vty_out (vty, "No such Area: %s\n", argv[idx_ipv4_2]->arg);
       return CMD_SUCCESS;
     }