diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-13 20:17:06 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 10:20:03 +0200 |
| commit | 625e016d14073dfefb69c0fa36cddb81fbe034ed (patch) | |
| tree | 025bb557646390501de37e86d3813c111ec25d31 /bgpd | |
| parent | *: remove VTYNL, part 5 of 6 (diff) | |
| download | frr-625e016d14073dfefb69c0fa36cddb81fbe034ed.tar.xz frr-625e016d14073dfefb69c0fa36cddb81fbe034ed.zip | |
*: remove VTYNL, part 6 of 6
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/rfapi/rfapi_rib.c | 11 | ||||
| -rw-r--r-- | bgpd/rfapi/rfapi_vty.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c index 2635ffeb5..380b04757 100644 --- a/bgpd/rfapi/rfapi_rib.c +++ b/bgpd/rfapi/rfapi_rib.c @@ -2500,19 +2500,18 @@ rfapiRibShowResponses ( { ++printedheader; - fp (out, "%s[%s]\n", - VTYNL, + fp (out, "\n[%s]\n", show_removed ? "Removed" : "Active"); fp (out, "%-15s %-15s\n", "Querying VN", "Querying UN"); - fp (out, " %-20s %-15s %-15s %4s %-8s %-8s%s", + fp (out, " %-20s %-15s %-15s %4s %-8s %-8s\n", "Prefix", "Registered VN", "Registered UN", "Cost", "Lifetime", #if RFAPI_REGISTRATIONS_REPORT_AGE - "Age", + "Age" #else - "Remaining", + "Remaining" #endif - VTYNL); + ); } if (!printednve) { diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index 06df51644..1b55fbbda 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -385,14 +385,14 @@ rfapiStdioPrintf (void *stream, const char *format, ...) /* Fake out for debug logging */ static struct vty vty_dummy_zlog; static struct vty vty_dummy_stdio; -#define HVTYNL ((vty == &vty_dummy_zlog)? "": VTYNL) +#define HVTYNL ((vty == &vty_dummy_zlog)? "": "\n") static const char * str_vty_newline (struct vty *vty) { if (vty == &vty_dummy_zlog) return ""; - return VTYNL; + return "\n"; } int |