X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fmfib%2Fmfib_test.c;h=fda02580bee0f23c642a032208f1610a8ef7b80e;hb=cc8fa169297b0052e5a8d570eb41e5875b28561f;hp=a94b308473ed84cb0fbebc76d5cbd50c734e900e;hpb=e821ab100aea2fb3f740a98650eb750ff5911c49;p=vpp.git

diff --git a/src/vnet/mfib/mfib_test.c b/src/vnet/mfib/mfib_test.c
index a94b308473e..fda02580bee 100644
--- a/src/vnet/mfib/mfib_test.c
+++ b/src/vnet/mfib/mfib_test.c
@@ -217,23 +217,6 @@ mfib_test_validate_rep_v (const replicate_t *rep,
     return (res);
 }
 
-static fib_forward_chain_type_t
-fib_forw_chain_type_from_fib_proto (fib_protocol_t proto)
-{
-    switch (proto)
-    {
-    case FIB_PROTOCOL_IP4:
-        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
-    case FIB_PROTOCOL_IP6:
-        return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
-    default:
-        break;
-    }
-    ASSERT(0);
-    return (0);
-}
-
-
 static int
 mfib_test_entry (fib_node_index_t fei,
                  mfib_entry_flags_t eflags,
@@ -246,7 +229,6 @@ mfib_test_entry (fib_node_index_t fei,
     va_list ap;
     int res;
 
-    va_start(ap, n_buckets);
 
     res = 0;
     mfe = mfib_entry_get(fei);
@@ -280,12 +262,13 @@ mfib_test_entry (fib_node_index_t fei,
                       format_mfib_prefix, &pfx,
                       format_dpo_type, tmp.dpoi_type);
 
+        va_start(ap, n_buckets);
         res = mfib_test_validate_rep_v(rep, n_buckets, &ap);
+        va_end(ap);
 
         dpo_reset(&tmp);
     }
 
-    va_end(ap);
 
     return (res);
 }
@@ -359,7 +342,7 @@ mfib_test_i (fib_protocol_t PROTO,
     int res;
 
     mfib_prefix_t all_1s;
-    memset(&all_1s, 0xfd, sizeof(all_1s));
+    clib_memset(&all_1s, 0xfd, sizeof(all_1s));
 
     res = 0;
     n_entries = pool_elts(mfib_entry_pool);