From 2c29d75021d684559146e656aac85f0c14ffb5ab Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 18 Dec 2015 10:26:56 +0100 Subject: Fix warnings/errors reported by clang Change-Id: Ifb2de64347526e3218e22067452f249ff878fd32 Signed-off-by: Damjan Marion --- vlib/Makefile.am | 2 ++ vlib/vlib/dpdk_buffer.c | 2 +- vlib/vlib/main.c | 2 +- vlib/vlib/threads.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'vlib') diff --git a/vlib/Makefile.am b/vlib/Makefile.am index 1275798532e..b38c843fc5f 100644 --- a/vlib/Makefile.am +++ b/vlib/Makefile.am @@ -90,6 +90,7 @@ nobase_include_HEADERS += \ vlib/unix/plugin.h \ vlib/unix/unix.h +if !WITH_DPDK noinst_PROGRAMS = vlib_unix vlib_unix_SOURCES = \ @@ -98,3 +99,4 @@ vlib_unix_SOURCES = \ vlib_unix_LDADD = libvlib_unix.la libvlib.la \ -lvppinfra -lpthread -lm -ldl -lrt +endif diff --git a/vlib/vlib/dpdk_buffer.c b/vlib/vlib/dpdk_buffer.c index dbbd5806fd2..68c1fcdb4b6 100644 --- a/vlib/vlib/dpdk_buffer.c +++ b/vlib/vlib/dpdk_buffer.c @@ -446,7 +446,7 @@ fill_free_list (vlib_main_t * vm, vlib_buffer_t * b; int n, i; u32 bi; - u32 n_remaining, n_alloc; + u32 n_remaining = 0, n_alloc = 0; unsigned socket_id = rte_socket_id ? rte_socket_id() : 0; struct rte_mempool *rmp = vm->buffer_main->pktmbuf_pools[socket_id]; struct rte_mbuf *mb; diff --git a/vlib/vlib/main.c b/vlib/vlib/main.c index 64bd3c02b60..f541ed3d57e 100644 --- a/vlib/vlib/main.c +++ b/vlib/vlib/main.c @@ -563,7 +563,7 @@ vlib_node_runtime_sync_stats (vlib_main_t * vm, r->clocks_since_last_overflow = 0; } -always_inline void +always_inline void __attribute__((unused)) vlib_process_sync_stats (vlib_main_t * vm, vlib_process_t * p, uword n_calls, diff --git a/vlib/vlib/threads.c b/vlib/vlib/threads.c index 405a4d644bc..73abba83f70 100644 --- a/vlib/vlib/threads.c +++ b/vlib/vlib/threads.c @@ -159,7 +159,7 @@ vlib_thread_init (vlib_main_t * vm) if (!tm->main_lcore) { tm->main_lcore = clib_bitmap_first_set(avail_cpu); - if (tm->main_lcore == ~0) + if (tm->main_lcore == (u8) ~0) return clib_error_return (0, "no available cpus to be used for the" " main thread"); } -- cgit 1.2.3-korg