diff options
49 files changed, 216 insertions, 216 deletions
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c index eb96822a19..d5a89c1ff5 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_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -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_outln (vty, "Max supress penalty: %u", damp->ceiling); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } else vty_outln (vty, "dampening not enabled for %s", diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c index 0d11794aa7..5538402070 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_outln (vty, ""); + vty_out (vty, VTYNL); } /* 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_outln (vty, " BGP allow martian next hop debugging is on"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_SUCCESS; } diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c index ac0a382496..b2f0c3ee25 100644 --- a/bgpd/bgp_filter.c +++ b/bgpd/bgp_filter.c @@ -538,7 +538,7 @@ DEFUN (no_ip_as_path, if (asfilter == NULL) { - vty_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_WARNING; } diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 125b06a41a..dcbfdebe49 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -699,7 +699,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_outln (vty, ""); + vty_out (vty, VTYNL); } rd_header = 0; } diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 69882a3176..4216a2d49b 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_outln (vty, ""); + vty_out (vty, VTYNL); } } } diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index cf7abd3f21..86befd3e84 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_outln (vty, ""); + vty_out (vty, VTYNL); } } else if (hdr->code >= 128) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index eb31e04e39..404360a3af 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -6504,7 +6504,7 @@ route_vty_out (struct vty *vty, struct prefix *p, } else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); #if ENABLE_BGP_VNC /* prints an additional line, indented, with VNC info, if present */ if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_ENCAP)) @@ -6641,7 +6641,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_outln (vty, ""); + vty_out (vty, VTYNL); } void @@ -6745,7 +6745,7 @@ route_vty_out_tag (struct vty *vty, struct prefix *p, { vty_out (vty, "notag/%d", label); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -6832,7 +6832,7 @@ route_vty_out_overlay (struct vty *vty, struct prefix *p, } } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* dampening route */ @@ -6896,7 +6896,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_outln (vty, ""); + vty_out (vty, VTYNL); } /* flap route */ @@ -6996,7 +6996,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_outln (vty, ""); + vty_out (vty, VTYNL); } static void @@ -7170,7 +7170,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p, } if (!json_paths) - vty_outln (vty, ""); + vty_out (vty, VTYNL); /* Line2 display Next-hop, Neighbor, Router-id */ /* Display the nexthop */ @@ -7319,7 +7319,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p, } if (!json_paths) - vty_outln (vty, ""); + vty_out (vty, VTYNL); /* display the link-local nexthop */ if (attr->extra && attr->extra->mp_nexthop_len == BGP_ATTR_NHLEN_IPV6_GLOBAL_AND_LL) @@ -7538,7 +7538,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_outln (vty, ""); + vty_out (vty, VTYNL); /* Line 4 display Community */ if (attr->community) @@ -7625,7 +7625,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p, } if (!json_paths) - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (binfo->extra && binfo->extra->damp_info) @@ -7700,7 +7700,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p, { if (!first) { - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -7740,7 +7740,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p, json_object_array_add(json_paths, json_path); } else - vty_outln (vty, ""); + vty_out (vty, VTYNL); } #define BGP_SHOW_HEADER_CSV "Flags, Network, Next Hop, Metric, LocPrf, Weight, Path" @@ -8223,7 +8223,7 @@ route_vty_out_detail_header (struct vty *vty, struct bgp *bgp, { if (first) vty_out (vty, " Not advertised to any peer"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -9227,7 +9227,7 @@ bgp_table_stats (struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi) vty_out (vty, "%12llu", ts.counts[i]); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return CMD_SUCCESS; } @@ -10659,7 +10659,7 @@ bgp_config_write_network_vpn (struct vty *vty, struct bgp *bgp, if (bgp_static->backdoor) vty_out (vty, " backdoor"); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return 0; } @@ -10706,7 +10706,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->tag), esi, buf2 , macrouter); - vty_outln (vty, ""); + vty_out (vty, VTYNL); if (macrouter) XFREE (MTYPE_TMP, macrouter); if (esi) @@ -10781,7 +10781,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp, vty_out (vty, " backdoor"); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* Aggregate-address configuration. */ @@ -10815,7 +10815,7 @@ bgp_config_write_network (struct vty *vty, struct bgp *bgp, if (bgp_aggregate->summary_only) vty_out (vty, " summary-only"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return 0; diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index 8670ccdfd6..b1b3336363 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_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, " Update-subgroup %" PRIu64 ":", subgrp->id); vty_out (vty, " Created: %s", timestamp_string (subgrp->uptime)); diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c index a1eb5c4a4e..3e62243957 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_outln (vty, ""); + vty_out (vty, VTYNL); } rd_header = 0; } diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 9c36116451..aed78cb35a 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6584,7 +6584,7 @@ bgp_config_write_peer_global (struct vty *vty, struct bgp *bgp, if_ras_printed = TRUE; } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* remote-as and peer-group */ @@ -6974,7 +6974,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, vty_out (vty, " send"); else vty_out (vty, " receive"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* Route reflector client. */ @@ -7121,7 +7121,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_outln (vty, ""); + vty_out (vty, VTYNL); } /* Soft reconfiguration inbound. */ @@ -7149,7 +7149,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_outln (vty, ""); + vty_out (vty, VTYNL); } /* Route server client. */ @@ -7287,7 +7287,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_outln (vty, ""); + vty_out (vty, VTYNL); *write = 1; } @@ -7374,7 +7374,7 @@ bgp_config_write (struct vty *vty) (bgp->inst_type == BGP_INSTANCE_TYPE_VIEW) ? "view" : "vrf", bgp->name); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); /* No Synchronization */ if (bgp_option_check (BGP_OPT_CONFIG_CISCO)) @@ -7445,7 +7445,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_outln (vty, ""); + vty_out (vty, VTYNL); } /* BGP enforce-first-as. */ @@ -7466,14 +7466,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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } /* write quanta */ @@ -7528,7 +7528,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_outln (vty, ""); + vty_out (vty, VTYNL); } /* BGP network import check. */ diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index de153def48..5cd8528ea9 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -2623,7 +2623,7 @@ bgp_rfapi_delete_nve_group ( vty_out (vty, " un="); rfapiPrintRfapiIpAddr (vty, &rfd->un_addr); if (vty) - vty_outln (vty, ""); + vty_out (vty, VTYNL); } list_delete (orphaned_nves); } @@ -4463,7 +4463,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) { vty_out (vty, "%hu ", (uint16_t) ((uintptr_t) data)); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (rfg->rt_import_list && rfg->rt_export_list && @@ -4550,7 +4550,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_outln (vty, ""); + vty_out (vty, VTYNL); } if (hc->default_rt_import_list && hc->default_rt_export_list && ecommunity_cmp (hc->default_rt_import_list, @@ -4665,7 +4665,7 @@ bgp_rfapi_cfg_write (struct vty *vty, struct bgp *bgp) vty_out (vty, "%d", rfg->response_lifetime); else vty_out (vty, "infinite"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (rfg->rt_import_list && rfg->rt_export_list && @@ -5035,7 +5035,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_outln (vty, "%-39s %d seconds", "Default RFP response lifetime:", hc->default_response_lifetime); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return; } diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 8a5c1dff91..2062164890 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_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Registration failed."); vty_outln (vty, "Confirm that either the VN or UN address matches a configured NVE group."); @@ -4465,10 +4465,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_outln (vty, ""); + vty_out (vty, VTYNL); } vty_out (vty, "%-24s ", "Prefixes registered:"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); rfapiCountAllItRoutes (&active_local_routes, &active_remote_routes, @@ -4480,16 +4480,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_outln (vty, ""); + vty_out (vty, VTYNL); } vty_out (vty, " %-20s ", "Remotely:"); vty_out (vty, "%-8s %-8u", "Active:", active_remote_routes); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " %-20s ", "In Holddown:"); vty_out (vty, "%-8s %-8u", "Active:", holddown_remote_routes); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " %-20s ", "Imported:"); vty_out (vty, "%-8s %-8u", "Active:", imported_remote_routes); break; @@ -4508,7 +4508,7 @@ rfapi_vty_show_nve_summary (struct vty *vty, show_nve_summary_t show_type) default: break; } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return 0; @@ -4622,7 +4622,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_outln (vty, ""); + vty_out (vty, VTYNL); 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); @@ -4719,7 +4719,7 @@ rfapi_show_registrations ( } if (!printed) { - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c index a2d676655d..e43b152e50 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_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_SUCCESS; } diff --git a/bgpd/rfp-example/librfp/rfp_example.c b/bgpd/rfp-example/librfp/rfp_example.c index 7bdd12c0e7..a0ba829087 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_outln (vty, ""); + vty_out (vty, VTYNL); write++; } diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index 46796f916c..efe5e6721b 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_outln (vty, ""); + vty_out (vty, VTYNL); } if (detail == ISIS_UI_LEVEL_DETAIL) { level = adj->level; - vty_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " Adjacency flaps: %u", adj->flaps); vty_out (vty, ", Last: %s ago", time2string (now - adj->last_flap)); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " Circuit type: %s", circuit_t2string (adj->circuit_t)); vty_out (vty, ", Speaks: %s", nlpid2string (&adj->nlpids)); - vty_outln (vty, ""); + vty_out (vty, VTYNL); if (adj->mt_count != 1 || adj->mt_set[0] != ISIS_MT_IPV4_UNICAST) { vty_outln (vty, " Topologies:"); @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, " %s", ip6); } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return; } diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index e3ef7d93af..73affa91dc 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); if (circuit->is_type & IS_LEVEL_1) { vty_outln (vty, " Level-1 Information:"); @@ -928,7 +928,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty, } else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } if (circuit->is_type & IS_LEVEL_2) @@ -959,7 +959,7 @@ isis_circuit_print_vty (struct isis_circuit *circuit, struct vty *vty, } else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } 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_outln (vty, ""); + vty_out (vty, VTYNL); } return; } diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 9bfefc665b..d0c4ccc306 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_outln (vty, ""); + vty_out (vty, VTYNL); return; } diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c index 33b33f7b92..25fdf717b0 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); write++; } diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 05dfa52874..f19c813360 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -1409,7 +1409,7 @@ DEFUN (show_isis_topology, vty_outln (vty, "IS-IS paths to level-%d routers that speak IP", level); isis_print_paths (vty, area->spftree[level-1]->paths, isis->sysid); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } 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", level); isis_print_paths (vty, area->spftree6[level-1]->paths, isis->sysid); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return CMD_SUCCESS; diff --git a/isisd/isis_te.c b/isisd/isis_te.c index b3bd1146f8..c4a0b9230b 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_outln (vty, ""); + vty_out (vty, VTYNL); } else vty_outln (vty, " Unknown TLV: [type(%#.2x), length(%#.2x)]", diff --git a/isisd/isisd.c b/isisd/isisd.c index b0d6144ed4..cf3b325131 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_outln (vty, ""); + vty_out (vty, VTYNL); if (isis->area_list) vty_outln (vty, "Number of areas : %d",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_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, " IPv4 route computation:"); vty_out (vty, " last run elapsed : "); vty_out_timestr(vty, spftree->last_run_timestamp); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, " last run duration : %u usec", (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_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, " last run duration : %llu msec", (unsigned long long)spftree->last_run_duration); @@ -1436,7 +1436,7 @@ DEFUN (show_isis_summary, spftree->runcount); } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_SUCCESS; } @@ -2174,7 +2174,7 @@ isis_config_write (struct vty *vty) else vty_out(vty, "send-only"); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); write++; } diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c index 968e6e44c2..466b6af8b2 100644 --- a/ldpd/ldp_debug.c +++ b/ldpd/ldp_debug.c @@ -127,7 +127,7 @@ ldp_vty_show_debugging(struct vty *vty) vty_outln (vty," LDP messages debugging is on (outbound)"); if (LDP_DEBUG(zebra, ZEBRA)) vty_outln (vty, " LDP zebra debugging is on"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (CMD_SUCCESS); } diff --git a/ldpd/ldp_vty_conf.c b/ldpd/ldp_vty_conf.c index df57c32592..900be046ea 100644 --- a/ldpd/ldp_vty_conf.c +++ b/ldpd/ldp_vty_conf.c @@ -155,7 +155,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf, if (af_conf->acl_thello_accept_from[0] != '\0') vty_out(vty, " from %s", af_conf->acl_thello_accept_from); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (af_conf->thello_holdtime != TARGETED_DFLT_HOLDTIME && @@ -182,7 +182,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf, else vty_out(vty, " for %s", af_conf->acl_label_allocate_for); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (af_conf->acl_label_advertise_for[0] != '\0' || @@ -194,7 +194,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf, if (af_conf->acl_label_advertise_for[0] != '\0') vty_out(vty, " for %s", af_conf->acl_label_advertise_for); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (af_conf->flags & F_LDPD_AF_EXPNULL) { @@ -202,7 +202,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf, if (af_conf->acl_label_expnull_for[0] != '\0') vty_out(vty, " for %s", af_conf->acl_label_expnull_for); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (af_conf->acl_label_accept_for[0] != '\0' || @@ -214,7 +214,7 @@ ldp_af_config_write(struct vty *vty, int af, struct ldpd_conf *conf, if (af_conf->acl_label_accept_for[0] != '\0') vty_out(vty, " for %s", af_conf->acl_label_accept_for); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (af_conf->flags & F_LDPD_AF_NO_GTSM) diff --git a/ldpd/ldp_vty_exec.c b/ldpd/ldp_vty_exec.c index ba1f4891ef..c956067023 100644 --- a/ldpd/ldp_vty_exec.c +++ b/ldpd/ldp_vty_exec.c @@ -135,7 +135,7 @@ show_interface_msg(struct vty *vty, struct imsg *imsg, iface->adj_cnt); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -217,7 +217,7 @@ show_discovery_msg(struct vty *vty, struct imsg *imsg, vty_outln (vty, "%9u", adj->holdtime); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -326,7 +326,7 @@ show_discovery_detail_msg(struct vty *vty, struct imsg *imsg, vty_out(vty, "%s", ifaces_buffer); vty_outln (vty, " Targeted Hellos:"); vty_out(vty, "%s", tnbrs_buffer); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -620,7 +620,7 @@ show_nbr_detail_msg(struct vty *vty, struct imsg *imsg, vty_outln (vty, " IPv6:"); vty_out(vty, "%s", v6adjs_buffer); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); break; case IMSG_CTL_END: return (1); @@ -898,10 +898,10 @@ show_nbr_capabilities_msg(struct vty *vty, struct imsg *imsg, struct show_params vty_outln (vty, "Peer LDP Identifier: %s:0", inet_ntoa(nbr->id)); show_nbr_capabilities(vty, nbr); - vty_outln (vty, ""); + vty_out (vty, VTYNL); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -1027,7 +1027,7 @@ show_lib_msg(struct vty *vty, struct imsg *imsg, struct show_params *params) rt->in_use ? "yes" : "no"); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -1099,7 +1099,7 @@ show_lib_detail_msg(struct vty *vty, struct imsg *imsg, struct show_params *para vty_outln (vty, "%-8sNo remote bindings",""); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -1261,7 +1261,7 @@ show_l2vpn_binding_msg(struct vty *vty, struct imsg *imsg, vty_outln (vty," Remote Label: unassigned"); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -1345,7 +1345,7 @@ show_l2vpn_pw_msg(struct vty *vty, struct imsg *imsg, struct show_params *params (pw->status ? "UP" : "DOWN")); break; case IMSG_CTL_END: - vty_outln (vty, ""); + vty_out (vty, VTYNL); return (1); default: break; @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); } /* diff --git a/lib/command.c b/lib/command.c index 9f62fef2d2..f019473308 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Protocol name: %s", zl->protoname); diff --git a/lib/distribute.c b/lib/distribute.c index a935e84ad6..c771f018c2 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_outln (vty, ""); + vty_out (vty, VTYNL); else vty_outln (vty, " not set"); @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); else vty_outln (vty, " nothing"); } @@ -437,7 +437,7 @@ config_show_distribute (struct vty *vty) DISTRIBUTE_V6_IN, has_print); } if (has_print) - vty_outln (vty, ""); + vty_out (vty, VTYNL); else vty_outln (vty, " not set"); @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); else vty_outln (vty, " nothing"); } diff --git a/lib/filter.c b/lib/filter.c index 06f661c191..3cef49b2da 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_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -1889,7 +1889,7 @@ config_write_access_zebra (struct vty *vty, struct filter *mfilter) p->prefixlen, filter->exact ? " exact-match" : ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } static int diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c index 5fc77475b9..9bb672dc53 100644 --- a/lib/grammar_sandbox.c +++ b/lib/grammar_sandbox.c @@ -418,14 +418,14 @@ DEFUN (grammar_findambig, prev->el->string); vty_outln (vty, " %s%s '%s'", cur->el->name, VTYNL, cur->el->string); - vty_outln (vty, ""); + vty_out (vty, VTYNL); ambig++; } prev = cur; } list_delete (commands); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } while (scan && scannode < LINK_PARAMS_NODE); vty_outln (vty, "%d ambiguous commands found.", ambig); @@ -543,7 +543,7 @@ pretty_print_graph (struct vty *vty, struct graph_node *start, int level, if (numto) { if (numto > 1) - vty_outln (vty, ""); + vty_out (vty, VTYNL); 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_outln (vty, ""); + vty_out (vty, VTYNL); } static void diff --git a/lib/keychain.c b/lib/keychain.c index 708b22252d..9fe887c2c0 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_outln (vty, ""); + vty_out (vty, VTYNL); } 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_outln (vty, ""); + vty_out (vty, VTYNL); } } vty_outln (vty, "!"); diff --git a/lib/plist.c b/lib/plist.c index 4a223d1262..172f2b39db 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_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -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_outln (vty, ""); + vty_out (vty, VTYNL); if (type == first_match_display) return CMD_SUCCESS; @@ -1860,7 +1860,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty) if (pentry->le) vty_out (vty, " le %d", pentry->le); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); write++; } /* vty_out (vty, "!%s", VTYNL); */ @@ -1903,7 +1903,7 @@ config_write_prefix_afi (afi_t afi, struct vty *vty) if (pentry->le) vty_out (vty, " le %d", pentry->le); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); write++; } } @@ -2073,7 +2073,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_outln (vty, ""); + vty_out (vty, VTYNL); } } return plist->count; @@ -730,7 +730,7 @@ vty_backward_word (struct vty *vty) static void vty_down_level (struct vty *vty) { - vty_outln (vty, ""); + vty_out (vty, VTYNL); cmd_exit (vty); vty_prompt (vty); vty->cp = 0; @@ -740,7 +740,7 @@ vty_down_level (struct vty *vty) static void vty_end_config (struct vty *vty) { - vty_outln (vty, ""); + vty_out (vty, VTYNL); switch (vty->node) { @@ -945,7 +945,7 @@ vty_complete_command (struct vty *vty) cmd_free_strvec (vline); - vty_outln (vty, ""); + vty_out (vty, VTYNL); switch (ret) { case CMD_ERR_AMBIGUOUS: @@ -985,11 +985,11 @@ vty_complete_command (struct vty *vty) for (i = 0; matched[i] != NULL; i++) { if (i != 0 && ((i % 6) == 0)) - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, "%-10s ", matched[i]); XFREE (MTYPE_COMPLETION, matched[i]); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_prompt (vty); vty_redraw_line (vty); @@ -1068,7 +1068,7 @@ vty_describe_command (struct vty *vty) describe = cmd_describe_command (vline, vty, &ret); - vty_outln (vty, ""); + vty_out (vty, VTYNL); /* Ambiguous error. */ switch (ret) @@ -1141,7 +1141,7 @@ vty_describe_command (struct vty *vty) vty_out(vty, " %s", item); XFREE(MTYPE_COMPLETION, item); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } vector_free(varcomps); } @@ -1186,7 +1186,7 @@ vty_stop_input (struct vty *vty) { vty->cp = vty->length = 0; vty_clear_buf (vty); - vty_outln (vty, ""); + vty_out (vty, VTYNL); switch (vty->node) { @@ -1310,7 +1310,7 @@ vty_telnet_option (struct vty *vty, unsigned char *buf, int nbytes) break; } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); #endif /* TELNET_OPTION_DEBUG */ @@ -1606,7 +1606,7 @@ vty_read (struct thread *thread) break; case '\n': case '\r': - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_execute (vty); break; case '\t': diff --git a/nhrpd/nhrp_vty.c b/nhrpd/nhrp_vty.c index b1b9ea54f9..5410027e70 100644 --- a/nhrpd/nhrp_vty.c +++ b/nhrpd/nhrp_vty.c @@ -868,7 +868,7 @@ static int interface_config_write(struct vty *vty) if (nifp->ipsec_fallback_profile) vty_out(vty, " fallback-profile %s", nifp->ipsec_fallback_profile); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (nifp->source) vty_outln (vty, " tunnel source %s", diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index b1a9cb05eb..2f157d98a0 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -861,7 +861,7 @@ ospf6_show (struct vty *vty, struct ospf6 *o) vty_outln (vty, " Adjacency changes are logged"); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); for (ALL_LIST_ELEMENTS_RO (o->area_list, n, oa)) ospf6_area_show (vty, oa); @@ -992,7 +992,7 @@ ospf6_distance_config_write (struct vty *vty) if (ospf6->distance_external) vty_out (vty, " external %u", ospf6->distance_external); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } for (rn = route_top (ospf6->distance_table); rn; rn = route_next (rn)) diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c index c927361f59..d09290e520 100644 --- a/ospfd/ospf_apiserver.c +++ b/ospfd/ospf_apiserver.c @@ -2201,7 +2201,7 @@ ospf_apiserver_show_info (struct vty *vty, struct ospf_lsa *lsa) { vty_out (vty, "0x%x ", olsa->data[i]); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } else { diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index c6724bdecd..3947d5182c 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -1653,7 +1653,7 @@ show_debugging_ospf_common (struct vty *vty, struct ospf *ospf) if (IS_DEBUG_OSPF (nssa, NSSA) == OSPF_DEBUG_NSSA) vty_outln (vty, " OSPF NSSA debugging is on"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_SUCCESS; } diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 1639949c82..05a5961385 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -4788,7 +4788,7 @@ show_ip_ospf_database_header (struct vty *vty, struct ospf_lsa *lsa) IS_ROUTER_LSA_VIRTUAL (rlsa) ? " VL-endpoint" : "", IS_ROUTER_LSA_SHORTCUT (rlsa) ? " Shortcut" : ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } vty_outln (vty, " LS Type: %s", lookup_msg(ospf_lsa_type_msg, lsa->data->type, NULL)); diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 0e0933adf1..0051298e4a 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -505,8 +505,8 @@ static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp, int mloo vty_outln (vty, "Multicast Loop : %d", mloop); vty_outln (vty, "Promiscuous : %s", (ifp->flags & IFF_PROMISC) ? "yes" : "no"); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); } static void igmp_show_interfaces(struct vty *vty, u_char uj) @@ -665,8 +665,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c inet_ntoa(pim_ifp->primary_address)); vty_outln (vty, "Uptime : %s", uptime); vty_outln (vty, "Version : %d", pim_ifp->igmp_version); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); vty_outln (vty, "Querier"); vty_outln (vty, "-------"); @@ -675,8 +675,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c vty_outln (vty, "Start Count : %d", igmp->startup_query_count); vty_outln (vty, "Query Timer : %s", query_hhmmss); vty_outln (vty, "Other Timer : %s", other_hhmmss); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); vty_outln (vty, "Timers"); vty_outln (vty, "------"); @@ -695,8 +695,8 @@ static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_c vty_outln (vty, "Robustness Variable : %d", igmp->querier_robustness_variable); vty_outln (vty, "Startup Query Interval : %ds", sqi); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); pim_print_ifp_flags(vty, ifp, mloop); } @@ -941,7 +941,7 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch } else { vty_outln (vty, "Address : %s", inet_ntoa(ifaddr)); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); // PIM neighbors print_header = 1; @@ -962,8 +962,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch } if (!print_header) { - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); } vty_outln (vty, "Designated Router"); @@ -973,8 +973,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch vty_outln (vty, "Uptime : %s", dr_uptime); vty_outln (vty, "Elections : %d", pim_ifp->pim_dr_election_count); vty_outln (vty, "Changes : %d", pim_ifp->pim_dr_election_changes); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); // FHR print_header = 1; @@ -998,8 +998,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch } if (!print_header) { - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); } vty_outln (vty, "Hellos"); @@ -1014,8 +1014,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch vty_outln (vty, "Send Failed : %d", pim_ifp->pim_ifstat_hello_sendfail); vty_outln (vty, "Generation ID : %08x", pim_ifp->pim_generation_id); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); pim_print_ifp_flags(vty, ifp, mloop); @@ -1029,8 +1029,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch pim_if_effective_override_interval_msec(ifp)); vty_outln (vty, "Join Prune Override Interval : %d msec", pim_if_jp_override_interval_msec(ifp)); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); vty_outln (vty, "LAN Prune Delay"); vty_outln (vty, "---------------"); @@ -1042,8 +1042,8 @@ static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_ch pim_ifp->pim_override_interval_msec); vty_outln (vty, "Override Interval (Highest) : %d msec", pim_ifp->pim_neighbors_highest_override_interval_msec); - vty_outln (vty, ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); + vty_out (vty, VTYNL); } } @@ -1153,7 +1153,7 @@ static void pim_show_interface_traffic (struct vty *vty, u_char uj) json = json_object_new_object (); else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s", "Interface", " HELLO", " JOIN", " PRUNE", " REGISTER", " REGISTER-STOP", " ASSERT"); @@ -1227,7 +1227,7 @@ static void pim_show_interface_traffic_single (struct vty *vty, const char *ifna json = json_object_new_object (); else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s", "Interface", " HELLO", " JOIN", " PRUNE", " REGISTER", " REGISTER-STOP", " ASSERT"); @@ -1537,7 +1537,7 @@ static void pim_show_neighbors_single(struct vty *vty, const char *neighbor, u_c vty_outln (vty, " Hello Option - T-bit : %s", option_t_bit ? "yes" : "no"); pim_bfd_show_info (vty, neigh->bfd_info, json_ifp, uj, 0); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } } @@ -1690,7 +1690,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c } if (!uj) - vty_outln (vty, ""); + vty_out (vty, VTYNL); } @@ -1699,7 +1699,7 @@ pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_c json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY)); json_object_free(json); } else { - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -2200,7 +2200,7 @@ static void pim_show_rpf(struct vty *vty, u_char uj) show_rpf_refresh_stats(vty, now, json); } else { show_rpf_refresh_stats(vty, now, json); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Source Group RpfIface RpfAddress RibNextHop Metric Pref"); } @@ -2277,7 +2277,7 @@ pim_print_pnc_cache_walkcb (struct hash_backet *backet, void *arg) vty_out (vty, "%-15s ", inet_ntoa (pnc->rpf.rpf_addr.u.prefix4)); vty_out (vty, "%-14s ", ifp ? ifp->name : "NULL"); vty_out (vty, "%s ", inet_ntoa (nh_node->gate.ipv4)); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return CMD_SUCCESS; } @@ -3196,7 +3196,7 @@ static void show_multicast_interfaces(struct vty *vty) struct listnode *node; struct interface *ifp; - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Interface Address ifi Vif PktsIn PktsOut BytesIn BytesOut"); @@ -3256,16 +3256,16 @@ DEFUN (show_ip_multicast, vty_outln (vty, "Mroute socket uptime: %s", uptime); - vty_outln (vty, ""); + vty_out (vty, VTYNL); pim_zebra_zclient_update (vty); pim_zlookup_show_ip_multicast (vty); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Maximum highest VifIndex: %d", PIM_MAX_USABLE_VIFS); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Upstream Join Timer: %d secs", qpim_t_periodic); vty_outln (vty, "Join/Prune Holdtime: %d secs", @@ -3275,11 +3275,11 @@ DEFUN (show_ip_multicast, vty_outln (vty, "PIM ECMP Rebalance: %s", qpim_ecmp_rebalance_enable ? "Enable" : "Disable"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); show_rpf_refresh_stats(vty, now, NULL); - vty_outln (vty, ""); + vty_out (vty, VTYNL); show_scan_oil_stats(vty, now); @@ -3587,7 +3587,7 @@ static void show_mroute_count(struct vty *vty) struct channel_oil *c_oil; struct static_route *s_route; - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Source Group LastUsed Packets Bytes WrongIf "); @@ -6518,7 +6518,7 @@ ip_msdp_show_peers_detail(struct vty *vty, const char *peer, u_char uj) mp->ka_tx_cnt, mp->ka_rx_cnt); vty_outln (vty, " SAs : %10d %10d", mp->sa_tx_cnt, mp->sa_rx_cnt); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -6687,7 +6687,7 @@ ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa, const char *src_str, vty_outln (vty, " SPT Setup : %s", spt_str); vty_outln (vty, " Uptime : %s", timebuf); vty_outln (vty, " State Timer : %s", statetimer); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 426241ac03..5526881d2b 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -254,7 +254,7 @@ int pim_interface_config_write(struct vty *vty) vty_out(vty, " ip pim hello %d", pim_ifp->pim_hello_period); if (pim_ifp->pim_default_holdtime != -1) vty_out(vty, " %d", pim_ifp->pim_default_holdtime); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* update source */ diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 418e0933e1..425b01c247 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -1922,7 +1922,7 @@ rip_interface_config_write (struct vty *vty) vty_out (vty, " auth-length old-ripd"); else vty_out (vty, " auth-length rfc"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (ri->auth_str) diff --git a/ripd/ripd.c b/ripd/ripd.c index c05104b290..c07831fdd5 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -3534,7 +3534,7 @@ DEFUN (show_ip_rip, vty_out (vty, "%3"ROUTE_TAG_PRI, (route_tag_t)rinfo->tag); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } return CMD_SUCCESS; } @@ -3576,7 +3576,7 @@ DEFUN (show_ip_rip_status, /* Redistribute information. */ vty_out (vty, " Redistributing:"); config_write_rip_redistribute (vty, 0); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " Default version control: send version %s,", lookup_msg(ri_version_msg,rip->version_send, NULL)); diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 78bf350c98..bfec173efc 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -2026,7 +2026,7 @@ DEFUN (show_ipv6_ripng, vty_out (vty, "R(a) %s/%d ", inet6_ntoa (p->prefix), p->prefixlen); #endif /* DEBUG */ - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, "%*s", 18, " "); vty_out (vty, "%*s", 28, " "); @@ -2051,7 +2051,7 @@ DEFUN (show_ipv6_ripng, ripng_route_subtype_print(rinfo), inet6_ntoa (p->prefix), p->prefixlen); #endif /* DEBUG */ - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, "%*s", 18, " "); len = vty_out (vty, "%s", inet6_ntoa (rinfo->nexthop)); @@ -2089,7 +2089,7 @@ DEFUN (show_ipv6_ripng, ripng_vty_out_uptime (vty, rinfo); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -2128,7 +2128,7 @@ DEFUN (show_ipv6_ripng_status, /* Redistribute information. */ vty_out (vty, " Redistributing:"); ripng_redistribute_write (vty, 0); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_out (vty, " Default version control: send version %d,", ripng->version); vty_outln (vty, " receive version %d ",ripng->version); diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 2b5cf37ad6..d10861a668 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -814,7 +814,7 @@ vtysh_rl_describe (void) fprintf (stdout, " %s", item); XFREE (MTYPE_COMPLETION, item); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } vector_free (varcomps); } @@ -2806,7 +2806,7 @@ DEFUN (vtysh_show_daemons, for (i = 0; i < array_size(vtysh_client); i++) if ( vtysh_client[i].fd >= 0 ) vty_out(vty, " %s", vtysh_client[i].name); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return CMD_SUCCESS; } diff --git a/zebra/interface.c b/zebra/interface.c index 41c8c4949b..a8ac405e36 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -944,7 +944,7 @@ connected_dump_vty (struct vty *vty, struct connected *connected) if (connected->label) vty_out (vty, " %s", connected->label); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* Dump interface neighbor address information to vty. */ @@ -959,7 +959,7 @@ nbr_connected_dump_vty (struct vty *vty, struct nbr_connected *connected) prefix_vty_out (vty, p); vty_out (vty, "/%d", p->prefixlen); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } #if defined (HAVE_RTADV) @@ -1089,14 +1089,14 @@ if_dump_vty (struct vty *vty, struct interface *ifp) vty_out (vty, " HWaddr: "); for (i = 0; i < ifp->hw_addr_len; i++) vty_out (vty, "%s%02x", i == 0 ? "" : ":", ifp->hw_addr[i]); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* Bandwidth in Mbps */ if (ifp->bandwidth != 0) { vty_out(vty, " bandwidth %u Mbps", ifp->bandwidth); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } for (rn = route_top (zebra_if->ipv4_subnets); rn; rn = route_next (rn)) @@ -1144,7 +1144,7 @@ if_dump_vty (struct vty *vty, struct interface *ifp) vty_out(vty, " Min: %u (micro-sec.)", iflp->min_delay); vty_out(vty, " Max: %u (micro-sec.)", iflp->max_delay); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (IS_PARAM_SET(iflp, LP_DELAY_VAR)) vty_outln (vty, " Link Delay Variation %u (micro-sec.)", @@ -1422,7 +1422,7 @@ if_show_description (struct vty *vty, vrf_id_t vrf_id) if (ifp->desc) vty_out (vty, "%s", ifp->desc); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -2767,7 +2767,7 @@ link_params_config_write (struct vty *vty, struct interface *ifp) vty_out(vty, " min %u", iflp->min_delay); vty_out(vty, " max %u", iflp->max_delay); } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } if (IS_PARAM_SET(iflp, LP_DELAY_VAR)) vty_outln (vty, " delay-variation %u", iflp->delay_var); @@ -2844,7 +2844,7 @@ if_config_write (struct vty *vty) if (ifc->label) vty_out (vty, " label %s", ifc->label); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } diff --git a/zebra/redistribute.c b/zebra/redistribute.c index 312f44b229..1b34e46ec4 100644 --- a/zebra/redistribute.c +++ b/zebra/redistribute.c @@ -698,7 +698,7 @@ zebra_import_table_config (struct vty *vty) if (rmap_name) vty_out(vty, " route-map %s", rmap_name); - vty_outln (vty, ""); + vty_out (vty, VTYNL); write = 1; } } diff --git a/zebra/rtadv.c b/zebra/rtadv.c index ff5453c522..677189751d 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -1561,7 +1561,7 @@ rtadv_config_write (struct vty *vty, struct interface *ifp) vty_out (vty, " no-autoconfig"); if (rprefix->AdvRouterAddressFlag) vty_out (vty, " router-address"); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 56314ef102..a8e7f5372c 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -534,14 +534,14 @@ fec_print (zebra_fec_t *fec, struct vty *vty) vty_out(vty, " Label: %s", label2str(fec->label, buf, BUFSIZ)); if (fec->label_index != MPLS_INVALID_LABEL_INDEX) vty_out(vty, ", Label Index: %u", fec->label_index); - vty_outln (vty, ""); + vty_out (vty, VTYNL); if (!list_isempty(fec->client_list)) { vty_out(vty, " Client list:"); for (ALL_LIST_ELEMENTS_RO(fec->client_list, node, client)) vty_out(vty, " %s(fd %d)", zebra_route_string(client->proto), client->sock); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } } @@ -1422,7 +1422,7 @@ nhlfe_print (zebra_nhlfe_t *nhlfe, struct vty *vty) } vty_out(vty, "%s", CHECK_FLAG (nhlfe->flags, NHLFE_FLAG_INSTALLED) ? " (installed)" : ""); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* @@ -2875,7 +2875,7 @@ zebra_mpls_print_lsp_table (struct vty *vty, struct zebra_vrf *zvrf, } } - vty_outln (vty, ""); + vty_out (vty, VTYNL); } list_delete (lsp_list); diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index e760ae6847..c861efbddf 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1635,7 +1635,7 @@ vty_show_ip_route_summary (struct vty *vty, struct route_table *table) vty_outln (vty, "------"); vty_outln (vty, "%-20s %-20d %-20d ", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL], fib_cnt[ZEBRA_ROUTE_TOTAL]); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* @@ -1713,7 +1713,7 @@ vty_show_ip_route_summary_prefix (struct vty *vty, struct route_table *table) vty_outln (vty, "------"); vty_outln (vty, "%-20s %-20d %-20d ", "Totals", rib_cnt[ZEBRA_ROUTE_TOTAL], fib_cnt[ZEBRA_ROUTE_TOTAL]); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } /* Show route summary. */ @@ -1966,7 +1966,7 @@ static_config (struct vty *vty, afi_t afi, safi_t safi, const char *cmd) mpls_label2str (si->snh_label.num_labels, si->snh_label.label, buf, sizeof buf, 0)); - vty_outln (vty, ""); + vty_out (vty, VTYNL); write = 1; } @@ -3057,7 +3057,7 @@ DEFUN (show_vrf, vty_out (vty, "inactive"); else vty_out (vty, "id %u table %u", zvrf_id (zvrf), zvrf->table_id); - vty_outln (vty, ""); + vty_out (vty, VTYNL); } diff --git a/zebra/zserv.c b/zebra/zserv.c index 7eead965b7..72f7382882 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -2674,7 +2674,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client) vty_out (vty, "Client: %s", zebra_route_string(client->proto)); if (client->instance) vty_out (vty, " Instance: %d", client->instance); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "------------------------ "); vty_outln (vty, "FD: %d ", client->sock); @@ -2705,7 +2705,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client) if (client->last_write_time) vty_outln (vty, "Last Sent Cmd: %s ", zserv_command_string(client->last_write_cmd)); - vty_outln (vty, ""); + vty_out (vty, VTYNL); vty_outln (vty, "Type Add Update Del "); vty_outln (vty, "================================================== "); @@ -2724,7 +2724,7 @@ zebra_show_client_detail (struct vty *vty, struct zserv *client) vty_outln (vty, "Interface Up Notifications: %d",client->ifup_cnt); vty_outln (vty, "Interface Down Notifications: %d",client->ifdown_cnt); - vty_outln (vty, ""); + vty_out (vty, VTYNL); return; } |