aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2017-06-13 17:04:28 -0400
committerChris Luke <chris_luke@comcast.com>2017-06-14 11:35:12 +0000
commit28b70af8e5b4bea004138cfca74e79b44803c5db (patch)
tree4aed49dcdfb26c03d4f7483d4c1a004527430327
parent6f7ebf900e6c65b73f8bb8f60ab5190cc2c893bc (diff)
VPP-874: fix coverity warnings in tw_timer_template.c
Best guess, tested carefully, should do no harm. Clang doesn't complain either way; it's not certain that this patch will make the coverity warnings in tw_timer_template.c disappear. Change-Id: I75aa0cfd8970751e823a1165df2a755e947c4cf9 Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--src/vppinfra/tw_timer_template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vppinfra/tw_timer_template.c b/src/vppinfra/tw_timer_template.c
index a0c407a..9253488 100644
--- a/src/vppinfra/tw_timer_template.c
+++ b/src/vppinfra/tw_timer_template.c
@@ -132,13 +132,13 @@ TW (tw_timer_start) (TWT (tw_timer_wheel) * tw, u32 pool_index, u32 timer_id,
#endif
glacier_ring_offset = interval >> (2 * TW_RING_SHIFT);
- ASSERT (glacier_ring_offset < TW_SLOTS_PER_RING);
- interval -= (glacier_ring_offset << (2 * TW_RING_SHIFT));
+ ASSERT ((u64) glacier_ring_offset < TW_SLOTS_PER_RING);
+ interval -= (((u64) glacier_ring_offset) << (2 * TW_RING_SHIFT));
#endif
#if TW_TIMER_WHEELS > 1
slow_ring_offset = interval >> TW_RING_SHIFT;
- ASSERT (slow_ring_offset < TW_SLOTS_PER_RING);
- interval -= (slow_ring_offset << TW_RING_SHIFT);
+ ASSERT ((u64) slow_ring_offset < TW_SLOTS_PER_RING);
+ interval -= (((u64) slow_ring_offset) << TW_RING_SHIFT);
#endif
fast_ring_offset = interval & TW_RING_MASK;