X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fpool.c;h=30848d558485154f319d895745835aaaeb97cfbf;hb=b4e5e50fe;hp=ed83b41afef9e57bc6e25a9e84ba5e98e321b890;hpb=b7f1faa7fbd4575f28766e552a73810c6de0ace3;p=vpp.git

diff --git a/src/vppinfra/pool.c b/src/vppinfra/pool.c
index ed83b41afef..30848d55848 100644
--- a/src/vppinfra/pool.c
+++ b/src/vppinfra/pool.c
@@ -55,9 +55,7 @@ _pool_init_fixed (void **pool_ptr, u32 elt_size, u32 max_elts)
   ASSERT (elt_size);
   ASSERT (max_elts);
 
-  vector_size = pool_aligned_header_bytes + vec_header_bytes (0)
-    + (u64) elt_size *max_elts;
-
+  vector_size = pool_aligned_header_bytes + (u64) elt_size *max_elts;
   free_index_size = vec_header_bytes (0) + sizeof (u32) * max_elts;
 
   /* Round up to a cache line boundary */
@@ -107,7 +105,8 @@ _pool_init_fixed (void **pool_ptr, u32 elt_size, u32 max_elts)
 
   /* Set the entire free bitmap */
   clib_bitmap_alloc (fh->free_bitmap, max_elts);
-  memset (fh->free_bitmap, 0xff, vec_len (fh->free_bitmap) * sizeof (uword));
+  clib_memset (fh->free_bitmap, 0xff,
+	       vec_len (fh->free_bitmap) * sizeof (uword));
 
   /* Clear any extraneous set bits */
   set_bits = vec_len (fh->free_bitmap) * BITS (uword);