From: Neale Ranns <nranns@cisco.com>
Date: Tue, 6 Jun 2017 13:52:14 +0000 (-0700)
Subject: Fix coverity error in IP4 Mtrie.
X-Git-Tag: v17.07-rc1~83
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=6ff05499ab14d1dd5979a210847612fa2b293cf4;p=vpp.git

Fix coverity error in IP4 Mtrie.

Change-Id: I586a758a8b4b0ea5ca030b2df2796f5acb49e154
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index e1987d56782..cc82384d537 100644
--- a/src/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -284,8 +284,8 @@ set_leaf (ip4_fib_mtrie_t * m,
   if (n_dst_bits_next_plies <= 0)
     {
       /* The mask length of the address to insert maps to this ply */
-      uword i, old_leaf_is_terminal;
-      u32 n_dst_bits_this_ply;
+      uword old_leaf_is_terminal;
+      u32 i, n_dst_bits_this_ply;
 
       /* The number of bits, and hence slots/buckets, we will fill */
       n_dst_bits_this_ply = clib_min (8, -n_dst_bits_next_plies);
@@ -413,8 +413,8 @@ set_root_leaf (ip4_fib_mtrie_t * m,
   if (n_dst_bits_next_plies <= 0)
     {
       /* The mask length of the address to insert maps to this ply */
-      uword i, old_leaf_is_terminal;
-      u32 n_dst_bits_this_ply;
+      uword old_leaf_is_terminal;
+      u32 i, n_dst_bits_this_ply;
 
       /* The number of bits, and hence slots/buckets, we will fill */
       n_dst_bits_this_ply = 16 - a->dst_address_length;