diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 17:30:56 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 17:30:56 +0200 |
| commit | 22106bbf6870c19db1a06f3182b894c852686eae (patch) | |
| tree | 9b2c8861988a80aa42d3095b804190e38d409903 /ospf6d/ospf6_spf.c | |
| parent | ospf6d: rewrite ospf6_lsdb_lookup_next() (diff) | |
| parent | Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master (diff) | |
| download | frr-22106bbf6870c19db1a06f3182b894c852686eae.tar.xz frr-22106bbf6870c19db1a06f3182b894c852686eae.zip | |
Merge remote-tracking branch 'frr/master' into table-hash-ospf6-lsdb-refactor
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d/ospf6_spf.c')
| -rw-r--r-- | ospf6d/ospf6_spf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 93f46951b..8d2e244c8 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -741,13 +741,13 @@ ospf6_spf_display_subtree (struct vty *vty, const char *prefix, int rest, int restnum; /* "prefix" is the space prefix of the display line */ - vty_out (vty, "%s+-%s [%d]%s", prefix, v->name, v->cost, VNL); + vty_out (vty, "%s+-%s [%d]\n", prefix, v->name, v->cost); len = strlen (prefix) + 4; next_prefix = (char *) malloc (len); if (next_prefix == NULL) { - vty_out (vty, "malloc failed%s", VNL); + vty_out (vty, "malloc failed\n"); return; } snprintf (next_prefix, len, "%s%s", prefix, (rest ? "| " : " ")); @@ -913,11 +913,11 @@ int config_write_ospf6_debug_spf (struct vty *vty) { if (IS_OSPF6_DEBUG_SPF (PROCESS)) - vty_out (vty, "debug ospf6 spf process%s", VNL); + vty_out (vty, "debug ospf6 spf process\n"); if (IS_OSPF6_DEBUG_SPF (TIME)) - vty_out (vty, "debug ospf6 spf time%s", VNL); + vty_out (vty, "debug ospf6 spf time\n"); if (IS_OSPF6_DEBUG_SPF (DATABASE)) - vty_out (vty, "debug ospf6 spf database%s", VNL); + vty_out (vty, "debug ospf6 spf database\n"); return 0; } @@ -928,7 +928,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); |