diff options
Diffstat (limited to 'ospfd/ospf_dump.c')
| -rw-r--r-- | ospfd/ospf_dump.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 08bedadf41..d8742943c0 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -146,8 +146,6 @@ void ospf_nbr_state_message(struct ospf_neighbor *nbr, char *buf, size_t size) else state = ISM_DROther; - memset(buf, 0, size); - snprintf(buf, size, "%s/%s", lookup_msg(ospf_nsm_state_msg, nbr->state, NULL), lookup_msg(ospf_ism_state_msg, state, NULL)); @@ -201,17 +199,17 @@ const char *ospf_timeval_dump(struct timeval *t, char *buf, size_t size) } if (w > 99) - snprintf(buf, size, "%ldw%1ldd", w, d); + snprintf(buf, size, "%luw%1lud", w, d); else if (w) - snprintf(buf, size, "%ldw%1ldd%02ldh", w, d, h); + snprintf(buf, size, "%luw%1lud%02luh", w, d, h); else if (d) - snprintf(buf, size, "%1ldd%02ldh%02ldm", d, h, m); + snprintf(buf, size, "%1lud%02luh%02lum", d, h, m); else if (h) - snprintf(buf, size, "%ldh%02ldm%02lds", h, m, (long)t->tv_sec); + snprintf(buf, size, "%luh%02lum%02lds", h, m, (long)t->tv_sec); else if (m) - snprintf(buf, size, "%ldm%02lds", m, (long)t->tv_sec); + snprintf(buf, size, "%lum%02lds", m, (long)t->tv_sec); else if (ms) - snprintf(buf, size, "%ld.%03lds", (long)t->tv_sec, ms); + snprintf(buf, size, "%ld.%03lus", (long)t->tv_sec, ms); else snprintf(buf, size, "%ld usecs", (long)t->tv_usec); @@ -254,8 +252,6 @@ static void ospf_packet_hello_dump(struct stream *s, uint16_t length) static char *ospf_dd_flags_dump(uint8_t flags, char *buf, size_t size) { - memset(buf, 0, size); - snprintf(buf, size, "%s|%s|%s", (flags & OSPF_DD_FLAG_I) ? "I" : "-", (flags & OSPF_DD_FLAG_M) ? "M" : "-", (flags & OSPF_DD_FLAG_MS) ? "MS" : "-"); @@ -265,8 +261,6 @@ static char *ospf_dd_flags_dump(uint8_t flags, char *buf, size_t size) static char *ospf_router_lsa_flags_dump(uint8_t flags, char *buf, size_t size) { - memset(buf, 0, size); - snprintf(buf, size, "%s|%s|%s", (flags & ROUTER_LSA_VIRTUAL) ? "V" : "-", (flags & ROUTER_LSA_EXTERNAL) ? "E" : "-", @@ -1689,7 +1683,7 @@ static int config_write_debug(struct vty *vty) return CMD_SUCCESS; if (ospf->instance) - sprintf(str, " %d", ospf->instance); + sprintf(str, " %u", ospf->instance); /* debug ospf ism (status|events|timers). */ if (IS_CONF_DEBUG_OSPF(ism, ISM) == OSPF_DEBUG_ISM) |