diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/if.c | 14 | ||||
| -rw-r--r-- | lib/jhash.c | 2 | ||||
| -rw-r--r-- | lib/vty.c | 2 | ||||
| -rw-r--r-- | lib/workqueue.c | 2 |
4 files changed, 9 insertions, 11 deletions
@@ -638,16 +638,14 @@ if_flag_dump (unsigned long flag) static void if_dump (const struct interface *ifp) { + struct listnode *node; + struct connected *c __attribute__((unused)); + + for (ALL_LIST_ELEMENTS_RO (ifp->connected, node, c)) zlog_info ("Interface %s vrf %u index %d metric %d mtu %d " -#ifdef HAVE_IPV6 - "mtu6 %d " -#endif /* HAVE_IPV6 */ - "%s", + "mtu6 %d %s", ifp->name, ifp->vrf_id, ifp->ifindex, ifp->metric, ifp->mtu, -#ifdef HAVE_IPV6 - ifp->mtu6, -#endif /* HAVE_IPV6 */ - if_flag_dump (ifp->flags)); + ifp->mtu6, if_flag_dump (ifp->flags)); } /* Interface printing for all interface. */ diff --git a/lib/jhash.c b/lib/jhash.c index decd066cd..6154c3463 100644 --- a/lib/jhash.c +++ b/lib/jhash.c @@ -105,7 +105,7 @@ jhash (const void *key, u_int32_t length, u_int32_t initval) * The length parameter here is the number of u_int32_ts in the key. */ u_int32_t -jhash2 (const u_int32_t * k, u_int32_t length, u_int32_t initval) +jhash2 (const u_int32_t *k, u_int32_t length, u_int32_t initval) { u_int32_t a, b, c, len; @@ -2486,7 +2486,7 @@ vty_log_fixed (char *buf, size_t len) if (!vtyvec) return; - iov[0].iov_base = (void *)buf; + iov[0].iov_base = buf; iov[0].iov_len = len; iov[1].iov_base = crlf; iov[1].iov_len = 2; diff --git a/lib/workqueue.c b/lib/workqueue.c index 6fad237e1..a45a6fc09 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -31,7 +31,7 @@ /* master list of work_queues */ static struct list _work_queues; -/* pointer primarly to avid an otherwise harmless warning on +/* pointer primarily to avoid an otherwise harmless warning on * ALL_LIST_ELEMENTS_RO */ static struct list *work_queues = &_work_queues; |