aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Ganne <gabriel.ganne@enea.com>2017-02-04 10:51:04 +0100
committerFlorin Coras <florin.coras@gmail.com>2017-02-05 23:24:31 +0000
commit71d73fe818b1cd25ca6b181c450c404d43ad4abe (patch)
treef044a00059c63ff53e27d9bbadeb43760f38d028
parent8e8f98c9d46788438bd176f7c2bfde0a5837cad9 (diff)
fix some 'stored but never read' warnings raised by clang
found by `scan-build make plugins-release` Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com> Change-Id: I52048e3a8ae3fb85eb3d91f6a5e15216dd7b9baa
-rw-r--r--src/vlib/error_funcs.h8
-rw-r--r--src/vlib/node_funcs.h5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/vlib/error_funcs.h b/src/vlib/error_funcs.h
index 1a3602e92c6..ab281ba2ef8 100644
--- a/src/vlib/error_funcs.h
+++ b/src/vlib/error_funcs.h
@@ -45,10 +45,12 @@
always_inline void
vlib_error_elog_count (vlib_main_t * vm, uword counter, uword increment)
{
- elog_main_t *em = &vm->elog_main;
if (VLIB_ELOG_MAIN_LOOP > 0 && increment > 0)
- elog (em, vec_elt_at_index (vm->error_elog_event_types, counter),
- increment);
+ {
+ elog_main_t *em = &vm->elog_main;
+ elog (em, vec_elt_at_index (vm->error_elog_event_types, counter),
+ increment);
+ }
}
always_inline void
diff --git a/src/vlib/node_funcs.h b/src/vlib/node_funcs.h
index 2116739602e..f49a8d6fa75 100644
--- a/src/vlib/node_funcs.h
+++ b/src/vlib/node_funcs.h
@@ -476,7 +476,7 @@ vlib_process_get_event_data (vlib_main_t * vm,
vlib_node_main_t *nm = &vm->node_main;
vlib_process_t *p;
vlib_process_event_type_t *et;
- uword t, l;
+ uword t;
void *event_data_vector;
p = vec_elt (nm->processes, nm->current_process_index);
@@ -490,8 +490,7 @@ vlib_process_get_event_data (vlib_main_t * vm,
p->non_empty_event_type_bitmap =
clib_bitmap_andnoti (p->non_empty_event_type_bitmap, t);
- l = _vec_len (p->pending_event_data_by_type_index[t]);
- ASSERT (l > 0);
+ ASSERT (_vec_len (p->pending_event_data_by_type_index[t]) > 0);
event_data_vector = p->pending_event_data_by_type_index[t];
p->pending_event_data_by_type_index[t] = 0;