*: ditch vty_outln(), part 1 of 2

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

1 files changed, 32 insertions, 32 deletions

diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
index 1fb52a94b5..bb745d0c2e 100644
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@ -906,7 +906,7 @@ show_vty_router_cap (struct vty *vty, struct ri_tlv_header *tlvh)
   struct ri_tlv_router_cap *top = (struct ri_tlv_router_cap *) tlvh;
 
   if (vty != NULL)
-    vty_outln (vty, "  Router Capabilities: 0x%x",ntohl(top->value));
+    vty_out (vty, "  Router Capabilities: 0x%x\n",ntohl(top->value));
     else
       zlog_debug ("    Router Capabilities: 0x%x", ntohl (top->value));
 
@@ -921,7 +921,7 @@ show_vty_pce_subtlv_address (struct vty *vty, struct ri_tlv_header *tlvh)
   if (ntohs (top->address.type) == PCE_ADDRESS_TYPE_IPV4)
     {
       if (vty != NULL)
-        vty_outln (vty, "  PCE Address: %s",inet_ntoa(top->address.value));
+        vty_out (vty, "  PCE Address: %s\n",inet_ntoa(top->address.value));
         else
           zlog_debug ("    PCE Address: %s", inet_ntoa (top->address.value));
     }
@@ -929,7 +929,7 @@ show_vty_pce_subtlv_address (struct vty *vty, struct ri_tlv_header *tlvh)
     {
       /* TODO: Add support to IPv6 with inet_ntop() */
       if (vty != NULL)
-        vty_outln (vty, "  PCE Address: 0x%x",
+        vty_out (vty, "  PCE Address: 0x%x\n",
                  ntohl(top->address.value.s_addr));
         else
           zlog_debug ("    PCE Address: 0x%x",
@@ -946,7 +946,7 @@ show_vty_pce_subtlv_path_scope (struct vty *vty, struct ri_tlv_header *tlvh)
     (struct ri_pce_subtlv_path_scope *) tlvh;
 
   if (vty != NULL)
-    vty_outln (vty, "  PCE Path Scope: 0x%x",ntohl(top->value));
+    vty_out (vty, "  PCE Path Scope: 0x%x\n",ntohl(top->value));
     else
       zlog_debug ("    PCE Path Scope: 0x%x", ntohl (top->value));
 
@@ -963,14 +963,14 @@ show_vty_pce_subtlv_domain (struct vty *vty, struct ri_tlv_header *tlvh)
     {
       tmp.s_addr = top->value;
       if (vty != NULL)
-        vty_outln (vty, "  PCE domain Area: %s",inet_ntoa(tmp));
+        vty_out (vty, "  PCE domain Area: %s\n",inet_ntoa(tmp));
         else
           zlog_debug ("    PCE domain Area: %s", inet_ntoa (tmp));
     }
   else
     {
       if (vty != NULL)
-        vty_outln (vty, "  PCE domain AS: %d",ntohl(top->value));
+        vty_out (vty, "  PCE domain AS: %d\n",ntohl(top->value));
         else
           zlog_debug ("    PCE domain AS: %d", ntohl (top->value));
     }
@@ -988,14 +988,14 @@ show_vty_pce_subtlv_neighbor (struct vty *vty, struct ri_tlv_header *tlvh)
     {
       tmp.s_addr = top->value;
       if (vty != NULL)
-        vty_outln (vty, "  PCE neighbor Area: %s",inet_ntoa(tmp));
+        vty_out (vty, "  PCE neighbor Area: %s\n",inet_ntoa(tmp));
         else
           zlog_debug ("    PCE neighbor Area: %s", inet_ntoa (tmp));
     }
   else
     {
       if (vty != NULL)
-        vty_outln (vty, "  PCE neighbor AS: %d",ntohl(top->value));
+        vty_out (vty, "  PCE neighbor AS: %d\n",ntohl(top->value));
         else
           zlog_debug ("    PCE neighbor AS: %d", ntohl (top->value));
     }
@@ -1008,7 +1008,7 @@ show_vty_pce_subtlv_cap_flag (struct vty *vty, struct ri_tlv_header *tlvh)
   struct ri_pce_subtlv_cap_flag *top = (struct ri_pce_subtlv_cap_flag *) tlvh;
 
   if (vty != NULL)
-    vty_outln (vty, "  PCE Capabilities Flag: 0x%x",ntohl(top->value));
+    vty_out (vty, "  PCE Capabilities Flag: 0x%x\n",ntohl(top->value));
     else
       zlog_debug ("    PCE Capabilities Flag: 0x%x", ntohl (top->value));
 
@@ -1019,7 +1019,7 @@ static u_int16_t
 show_vty_unknown_tlv (struct vty *vty, struct ri_tlv_header *tlvh)
 {
   if (vty != NULL)
-    vty_outln (vty, "  Unknown TLV: [type(0x%x), length(0x%x)]",
+    vty_out (vty, "  Unknown TLV: [type(0x%x), length(0x%x)]\n",
              ntohs (tlvh->type), ntohs(tlvh->length));
     else
       zlog_debug ("    Unknown TLV: [type(0x%x), length(0x%x)]",
@@ -1105,16 +1105,16 @@ ospf_router_info_config_write_router (struct vty *vty)
   if (OspfRI.status == enabled)
     {
       if (OspfRI.scope == OSPF_OPAQUE_AS_LSA)
-        vty_outln (vty, " router-info as");
+        vty_out (vty, " router-info as\n");
       else
-        vty_outln (vty, " router-info area %s",inet_ntoa(OspfRI.area_id));
+        vty_out (vty, " router-info area %s\n",inet_ntoa(OspfRI.area_id));
 
       if (pce->pce_address.header.type != 0)
-        vty_outln (vty, "  pce address %s",
+        vty_out (vty, "  pce address %s\n",
                  inet_ntoa(pce->pce_address.address.value));
 
       if (pce->pce_cap_flag.header.type != 0)
-        vty_outln (vty, "  pce flag 0x%x",ntohl(pce->pce_cap_flag.value));
+        vty_out (vty, "  pce flag 0x%x\n",ntohl(pce->pce_cap_flag.value));
 
       for (ALL_LIST_ELEMENTS_RO (pce->pce_domain, node, domain))
         {
@@ -1123,11 +1123,11 @@ ospf_router_info_config_write_router (struct vty *vty)
               if (domain->type == PCE_DOMAIN_TYPE_AREA)
                 {
                   tmp.s_addr = domain->value;
-                  vty_outln (vty, "  pce domain area %s",inet_ntoa(tmp));
+                  vty_out (vty, "  pce domain area %s\n",inet_ntoa(tmp));
                 }
               else
                 {
-                  vty_outln (vty, "  pce domain as %d",ntohl(domain->value));
+                  vty_out (vty, "  pce domain as %d\n",ntohl(domain->value));
                 }
             }
         }
@@ -1139,18 +1139,18 @@ ospf_router_info_config_write_router (struct vty *vty)
               if (neighbor->type == PCE_DOMAIN_TYPE_AREA)
                 {
                   tmp.s_addr = neighbor->value;
-                  vty_outln (vty, "  pce neighbor area %s",inet_ntoa(tmp));
+                  vty_out (vty, "  pce neighbor area %s\n",inet_ntoa(tmp));
                 }
               else
                 {
-                  vty_outln (vty, "  pce neighbor as %d",
+                  vty_out (vty, "  pce neighbor as %d\n",
                            ntohl(neighbor->value));
                 }
             }
         }
 
       if (pce->pce_scope.header.type != 0)
-        vty_outln (vty, "  pce scope 0x%x",
+        vty_out (vty, "  pce scope 0x%x\n",
                  ntohl(OspfRI.pce_info.pce_scope.value));
     }
   return;
@@ -1181,7 +1181,7 @@ DEFUN (router_info,
     {
       if (!inet_aton (area, &OspfRI.area_id))
         {
-          vty_outln (vty, "%% specified Area ID %s is invalid",
+          vty_out (vty, "%% specified Area ID %s is invalid\n",
                    area);
           return CMD_WARNING;
         }
@@ -1257,7 +1257,7 @@ ospf_ri_enabled (struct vty *vty)
     return 1;
 
   if (vty)
-    vty_outln (vty, "%% OSPF RI is not turned on");
+    vty_out (vty, "%% OSPF RI is not turned on\n");
 
   return 0;
 }
@@ -1278,7 +1278,7 @@ DEFUN (pce_address,
 
   if (!inet_aton (argv[idx_ipv4]->arg, &value))
     {
-      vty_outln (vty, "Please specify PCE Address by A.B.C.D");
+      vty_out (vty, "Please specify PCE Address by A.B.C.D\n");
       return CMD_WARNING;
     }
 
@@ -1330,7 +1330,7 @@ DEFUN (pce_path_scope,
 
   if (sscanf (argv[idx_bitpattern]->arg, "0x%x", &scope) != 1)
     {
-      vty_outln (vty, "pce_path_scope: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "pce_path_scope: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1384,7 +1384,7 @@ DEFUN (pce_domain,
 
   if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
     {
-      vty_outln (vty, "pce_domain: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "pce_domain: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1421,7 +1421,7 @@ DEFUN (no_pce_domain,
 
   if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
     {
-      vty_outln (vty, "no_pce_domain: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "no_pce_domain: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1455,7 +1455,7 @@ DEFUN (pce_neigbhor,
 
   if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
     {
-      vty_outln (vty, "pce_neighbor: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "pce_neighbor: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1492,7 +1492,7 @@ DEFUN (no_pce_neighbor,
 
   if (sscanf (argv[idx_number]->arg, "%d", &as) != 1)
     {
-      vty_outln (vty, "no_pce_neighbor: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "no_pce_neighbor: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1523,7 +1523,7 @@ DEFUN (pce_cap_flag,
 
   if (sscanf (argv[idx_bitpattern]->arg, "0x%x", &cap) != 1)
     {
-      vty_outln (vty, "pce_cap_flag: fscanf: %s",safe_strerror(errno));
+      vty_out (vty, "pce_cap_flag: fscanf: %s\n",safe_strerror(errno));
       return CMD_WARNING;
     }
 
@@ -1568,13 +1568,13 @@ DEFUN (show_ip_ospf_router_info,
 
   if (OspfRI.status == enabled)
     {
-      vty_outln (vty, "--- Router Information parameters ---");
+      vty_out (vty, "--- Router Information parameters ---\n");
       show_vty_router_cap (vty, &OspfRI.router_cap.header);
     }
   else
     {
       if (vty != NULL)
-        vty_outln (vty, "  Router Information is disabled on this router");
+        vty_out (vty, "  Router Information is disabled on this router\n");
     }
   return CMD_SUCCESS;
 }
@@ -1596,7 +1596,7 @@ DEFUN (show_ip_opsf_router_info_pce,
 
   if (OspfRI.status == enabled)
     {
-      vty_outln (vty, "--- PCE parameters ---");
+      vty_out (vty, "--- PCE parameters ---\n");
 
       if (pce->pce_address.header.type != 0)
         show_vty_pce_subtlv_address (vty, &pce->pce_address.header);
@@ -1622,7 +1622,7 @@ DEFUN (show_ip_opsf_router_info_pce,
     }
   else
     {
-      vty_outln (vty,"  Router Information is disabled on this router");
+      vty_out (vty,"  Router Information is disabled on this router\n");
     }
 
   return CMD_SUCCESS;