X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fstats%2Fstats_to_be_deprecated.c;h=08117a1b7366ea876cf6f45ede65030b9161f6e5;hb=ae8098350cb7b96f7495fa4d4180238064256e14;hp=241bdd978df8ba5e350febbe1f51669227ac37b9;hpb=2f6d7bb93c157b874efb79a2d1583a4c368bf89a;p=vpp.git

diff --git a/src/vpp/stats/stats_to_be_deprecated.c b/src/vpp/stats/stats_to_be_deprecated.c
index 241bdd978df..08117a1b736 100644
--- a/src/vpp/stats/stats_to_be_deprecated.c
+++ b/src/vpp/stats/stats_to_be_deprecated.c
@@ -870,7 +870,7 @@ do_combined_per_interface_counters (stats_main_t * sm)
 	      continue;
 	    }
 	  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
-	  memset (mp, 0, sizeof (*mp));
+	  clib_memset (mp, 0, sizeof (*mp));
 
 	  mp->_vl_msg_id =
 	    ntohs (VL_API_VNET_PER_INTERFACE_COMBINED_COUNTERS);
@@ -1070,7 +1070,7 @@ do_simple_per_interface_counters (stats_main_t * sm)
 	    }
 
 	  mp = vl_msg_api_alloc_as_if_client (sizeof (*mp) + sizeof (*vp));
-	  memset (mp, 0, sizeof (*mp));
+	  clib_memset (mp, 0, sizeof (*mp));
 	  mp->_vl_msg_id = ntohs (VL_API_VNET_PER_INTERFACE_SIMPLE_COUNTERS);
 
 	  /*
@@ -2005,7 +2005,7 @@ do_ip6_fib_counters (stats_main_t * sm)
   u32 items_this_message;
   vl_api_ip6_fib_counter_t *ctrp = 0;
   u32 start_at_fib_index = 0;
-  BVT (clib_bihash) * h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
+  clib_bihash_24_8_t *h = &im6->ip6_table[IP6_FIB_TABLE_FWDING].ip6_hash;
   add_routes_in_fib_arg_t _a, *a = &_a;
   int i;
 
@@ -2049,7 +2049,7 @@ again:
       if (clib_setjmp (&sm->jmp_buf, 0) == 0)
 	{
 	  start_at_fib_index = fib - im6->fibs;
-	  BV (clib_bihash_foreach_key_value_pair) (h, add_routes_in_fib, a);
+	  clib_bihash_foreach_key_value_pair_24_8 (h, add_routes_in_fib, a);
 	}
       else
 	{
@@ -3046,8 +3046,8 @@ vl_api_vnet_get_summary_stats_t_handler (vl_api_vnet_get_summary_stats_t * mp)
   rmp->context = mp->context;
   rmp->retval = 0;
 
-  memset (total_pkts, 0, sizeof (total_pkts));
-  memset (total_bytes, 0, sizeof (total_bytes));
+  clib_memset (total_pkts, 0, sizeof (total_pkts));
+  clib_memset (total_bytes, 0, sizeof (total_bytes));
 
   vnet_interface_counter_lock (im);
 
@@ -3128,7 +3128,7 @@ stats_init (vlib_main_t * vm)
   sm->data_structure_lock =
     clib_mem_alloc_aligned (sizeof (data_structure_lock_t),
 			    CLIB_CACHE_LINE_BYTES);
-  memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
+  clib_memset (sm->data_structure_lock, 0, sizeof (*sm->data_structure_lock));
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \