diff options
| -rw-r--r-- | bgpd/bgp_table.c | 2 | ||||
| -rw-r--r-- | lib/nexthop.c | 4 | ||||
| -rw-r--r-- | lib/prefix.c | 12 | ||||
| -rw-r--r-- | lib/sockunion.c | 2 | ||||
| -rw-r--r-- | lib/srcdest_table.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/bgpd/bgp_table.c b/bgpd/bgp_table.c index 50123c608..d6dd03e2a 100644 --- a/bgpd/bgp_table.c +++ b/bgpd/bgp_table.c @@ -209,7 +209,7 @@ static ssize_t printfrr_bd(struct fbuf *buf, const char **fmt, char cbuf[PREFIX_STRLEN]; if (!dest) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); /* need to get the real length even if buffer too small */ prefix2str(p, cbuf, sizeof(cbuf)); diff --git a/lib/nexthop.c b/lib/nexthop.c index 64b4f3adb..443df9944 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -749,7 +749,7 @@ static ssize_t printfrr_nh(struct fbuf *buf, const char **fmt, } if (!nexthop) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); switch (nexthop->type) { case NEXTHOP_TYPE_IPV4: @@ -799,7 +799,7 @@ static ssize_t printfrr_nh(struct fbuf *buf, const char **fmt, (*fmt)++; if (!nexthop) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); switch (nexthop->type) { case NEXTHOP_TYPE_IFINDEX: diff --git a/lib/prefix.c b/lib/prefix.c index 169e9ed57..fba26a5b6 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -1368,7 +1368,7 @@ static ssize_t printfrr_ea(struct fbuf *buf, const char **fmt, char cbuf[ETHER_ADDR_STRLEN]; if (!mac) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); /* need real length even if buffer is too short */ prefix_mac2str(mac, cbuf, sizeof(cbuf)); @@ -1383,7 +1383,7 @@ static ssize_t printfrr_ia(struct fbuf *buf, const char **fmt, char cbuf[INET6_ADDRSTRLEN]; if (!ipa) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); ipaddr2str(ipa, cbuf, sizeof(cbuf)); return bputs(buf, cbuf); @@ -1396,7 +1396,7 @@ static ssize_t printfrr_i4(struct fbuf *buf, const char **fmt, char cbuf[INET_ADDRSTRLEN]; if (!ptr) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); inet_ntop(AF_INET, ptr, cbuf, sizeof(cbuf)); return bputs(buf, cbuf); @@ -1409,7 +1409,7 @@ static ssize_t printfrr_i6(struct fbuf *buf, const char **fmt, char cbuf[INET6_ADDRSTRLEN]; if (!ptr) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); inet_ntop(AF_INET6, ptr, cbuf, sizeof(cbuf)); return bputs(buf, cbuf); @@ -1422,7 +1422,7 @@ static ssize_t printfrr_pfx(struct fbuf *buf, const char **fmt, char cbuf[PREFIX_STRLEN]; if (!ptr) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); prefix2str(ptr, cbuf, sizeof(cbuf)); return bputs(buf, cbuf); @@ -1436,7 +1436,7 @@ static ssize_t printfrr_psg(struct fbuf *buf, const char **fmt, ssize_t ret = 0; if (!sg) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); if (sg->src.s_addr == INADDR_ANY) ret += bputs(buf, "(*,"); diff --git a/lib/sockunion.c b/lib/sockunion.c index 25de8f7dd..ecbb0fcf9 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -674,7 +674,7 @@ static ssize_t printfrr_psu(struct fbuf *buf, const char **fmt, char cbuf[INET6_ADDRSTRLEN]; if (!su) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); while (!endflags) { switch (**fmt) { diff --git a/lib/srcdest_table.c b/lib/srcdest_table.c index ca48d56e4..b2422ba46 100644 --- a/lib/srcdest_table.c +++ b/lib/srcdest_table.c @@ -315,7 +315,7 @@ static ssize_t printfrr_rn(struct fbuf *buf, const char **fmt, char cbuf[PREFIX_STRLEN * 2 + 6]; if (!rn) - return bputs(buf, "NULL"); + return bputs(buf, "(null)"); srcdest_rnode_prefixes(rn, &dst_p, &src_p); srcdest2str(dst_p, (const struct prefix_ipv6 *)src_p, |