diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-13 17:49:13 +0200 | 
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-13 20:29:22 +0200 | 
| commit | 5c7571d43f57317b0827ac82fbebc4cdc6865be0 (patch) | |
| tree | 2bc63ccbd805abc9689e9f3345e34871558d5c26 /ospf6d | |
| parent | 83eba583d7be5afaf2eba35ce4d391f645af4bfa (diff) | |
*: ditch vty_outln(), part 1 of 2
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_area.c | 10 | ||||
| -rw-r--r-- | ospf6d/ospf6_bfd.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_interface.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_spf.c | 2 | ||||
| -rw-r--r-- | ospf6d/ospf6_top.c | 18 | ||||
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 6 | 
6 files changed, 21 insertions, 21 deletions
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 826a66ccc6..ee4d7559ee 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -396,18 +396,18 @@ ospf6_area_show (struct vty *vty, struct ospf6_area *oa)        result = monotime_since(&oa->ts_spf, NULL);        if (result/TIMER_SECOND_MICRO > 0)  	{ -	  vty_outln (vty, "SPF last executed %ld.%lds ago", +	  vty_out (vty, "SPF last executed %ld.%lds ago\n",  		   result/TIMER_SECOND_MICRO,  		   result % TIMER_SECOND_MICRO);  	}        else  	{ -	  vty_outln (vty, "SPF last executed %ldus ago", +	  vty_out (vty, "SPF last executed %ldus ago\n",  		   result);  	}      }    else -    vty_outln (vty, "SPF has not been run"); +    vty_out (vty, "SPF has not been run\n");  } @@ -968,7 +968,7 @@ DEFUN (ospf6_area_stub,    if (!ospf6_area_stub_set (ospf6, area))      { -      vty_outln (vty,"First deconfigure all virtual link through this area"); +      vty_out (vty,"First deconfigure all virtual link through this area\n");        return CMD_WARNING;      } @@ -993,7 +993,7 @@ DEFUN (ospf6_area_stub_no_summary,    if (!ospf6_area_stub_set (ospf6, area))      { -      vty_outln (vty,"First deconfigure all virtual link through this area"); +      vty_out (vty,"First deconfigure all virtual link through this area\n");        return CMD_WARNING;      } diff --git a/ospf6d/ospf6_bfd.c b/ospf6d/ospf6_bfd.c index 6ca56869d5..f460bf0653 100644 --- a/ospf6d/ospf6_bfd.c +++ b/ospf6d/ospf6_bfd.c @@ -295,11 +295,11 @@ ospf6_bfd_write_config(struct vty *vty, struct ospf6_interface *oi)    bfd_info = (struct bfd_info *)oi->bfd_info;    if (CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)) -    vty_outln (vty, " ipv6 ospf6 bfd %d %d %d", +    vty_out (vty, " ipv6 ospf6 bfd %d %d %d\n",                bfd_info->detect_mult, bfd_info->required_min_rx,                bfd_info->desired_min_tx);    else -    vty_outln (vty, " ipv6 ospf6 bfd"); +    vty_out (vty, " ipv6 ospf6 bfd\n");  }  /* diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index e91c249845..16784ad64a 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -1307,7 +1307,7 @@ DEFUN (auto_cost_reference_bandwidth,    refbw = strtol (argv[idx_number]->arg, NULL, 10);    if (refbw < 1 || refbw > 4294967)      { -      vty_outln (vty, "reference-bandwidth value is invalid"); +      vty_out (vty, "reference-bandwidth value is invalid\n");        return CMD_WARNING;      } diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 0b8a5e4767..35b90f2803 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -929,7 +929,7 @@ ospf6_spf_config_write (struct vty *vty)    if (ospf6->spf_delay != OSPF_SPF_DELAY_DEFAULT ||        ospf6->spf_holdtime != OSPF_SPF_HOLDTIME_DEFAULT ||        ospf6->spf_max_holdtime != OSPF_SPF_MAX_HOLDTIME_DEFAULT) -    vty_outln (vty, " timers throttle spf %d %d %d", +    vty_out (vty, " timers throttle spf %d %d %d\n",  	     ospf6->spf_delay, ospf6->spf_holdtime,  	     ospf6->spf_max_holdtime); diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c index 268b7a60a2..34af891f12 100644 --- a/ospf6d/ospf6_top.c +++ b/ospf6d/ospf6_top.c @@ -811,7 +811,7 @@ ospf6_show (struct vty *vty, struct ospf6 *o)    /* Redistribute configuration */    /* XXX */ -  vty_outln (vty, " LSA minimum arrival %d msecs",o->lsa_minarrival); +  vty_out (vty, " LSA minimum arrival %d msecs\n",o->lsa_minarrival);    /* Show SPF parameters */    vty_out(vty, " Initial SPF scheduling delay %d millisec(s)%s" @@ -854,9 +854,9 @@ ospf6_show (struct vty *vty, struct ospf6 *o)    if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))      {        if (CHECK_FLAG(o->config_flags, OSPF6_LOG_ADJACENCY_DETAIL)) -	vty_outln (vty, " All adjacency changes are logged"); +	vty_out (vty, " All adjacency changes are logged\n");        else -	vty_outln (vty, " Adjacency changes are logged"); +	vty_out (vty, " Adjacency changes are logged\n");      }    vty_out (vty, VTYNL); @@ -975,7 +975,7 @@ ospf6_distance_config_write (struct vty *vty)    struct ospf6_distance *odistance;    if (ospf6->distance_all) -    vty_outln (vty, " distance %u", ospf6->distance_all); +    vty_out (vty, " distance %u\n", ospf6->distance_all);    if (ospf6->distance_intra        || ospf6->distance_inter @@ -998,7 +998,7 @@ ospf6_distance_config_write (struct vty *vty)        {  	char buf[PREFIX_STRLEN]; -        vty_outln (vty, " distance %u %s %s", odistance->distance, +        vty_out (vty, " distance %u %s %s\n", odistance->distance,  		 prefix2str (&rn->p, buf, sizeof (buf)),                   odistance->access_list ? odistance->access_list : "");        } @@ -1027,13 +1027,13 @@ config_write_ospf6 (struct vty *vty)    if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_CHANGES))      {        if (CHECK_FLAG(ospf6->config_flags, OSPF6_LOG_ADJACENCY_DETAIL)) -        vty_outln (vty, " log-adjacency-changes detail"); +        vty_out (vty, " log-adjacency-changes detail\n");        else if (!DFLT_OSPF6_LOG_ADJACENCY_CHANGES) -        vty_outln (vty, " log-adjacency-changes"); +        vty_out (vty, " log-adjacency-changes\n");      }    else if (DFLT_OSPF6_LOG_ADJACENCY_CHANGES)      { -      vty_outln (vty, " no log-adjacency-changes"); +      vty_out (vty, " no log-adjacency-changes\n");      }    if (ospf6->ref_bandwidth != OSPF6_REFERENCE_BANDWIDTH) @@ -1042,7 +1042,7 @@ config_write_ospf6 (struct vty *vty)    /* LSA timers print. */    if (ospf6->lsa_minarrival != OSPF_MIN_LS_ARRIVAL) -    vty_outln (vty, " timers lsa min-arrival %d",ospf6->lsa_minarrival); +    vty_out (vty, " timers lsa min-arrival %d\n",ospf6->lsa_minarrival);    ospf6_stub_router_config_write (vty);    ospf6_redistribute_config_write (vty); diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index ea36ceabdf..ff00bc7a5a 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -683,7 +683,7 @@ ospf6_distance_set (struct vty *vty, struct ospf6 *o,    ret = str2prefix_ipv6 (ip_str, &p);    if (ret == 0)      { -      vty_outln (vty, "Malformed prefix"); +      vty_out (vty, "Malformed prefix\n");        return CMD_WARNING;      } @@ -731,14 +731,14 @@ ospf6_distance_unset (struct vty *vty, struct ospf6 *o,    ret = str2prefix_ipv6 (ip_str, &p);    if (ret == 0)      { -      vty_outln (vty, "Malformed prefix"); +      vty_out (vty, "Malformed prefix\n");        return CMD_WARNING;      }    rn = route_node_lookup (o->distance_table, (struct prefix *) &p);    if (!rn)      { -      vty_outln (vty, "Cant't find specified prefix"); +      vty_out (vty, "Cant't find specified prefix\n");        return CMD_WARNING;      }  | 
