misc: make format_hexdump length u32

[vpp.git] / src / vppinfra / sparse_vec.h

diff --git a/src/vppinfra/sparse_vec.h b/src/vppinfra/sparse_vec.h
index dc9cb00..3bd440d 100644 (file)
--- a/src/vppinfra/sparse_vec.h
+++ b/src/vppinfra/sparse_vec.h
@@ -73,15 +73,14 @@ sparse_vec_new (uword elt_bytes, uword sparse_index_bits)
   void *v;
   sparse_vec_header_t *h;
   word n;
+  vec_attr_t va = { .elt_sz = elt_bytes, .hdr_sz = sizeof (h[0]) };
 
   ASSERT (sparse_index_bits <= 16);
 
-  v = _vec_realloc (0, /* data bytes */ 8, elt_bytes,
-                   /* header bytes */ sizeof (h[0]), /* data align */ 0,
-                   /* heap */ 0);
+  v = _vec_alloc_internal (/* data bytes */ 8, &va);
 
   /* Make space for invalid entry (entry 0). */
-  _vec_find (v)->len = 1;
+  _vec_set_len (v, 1, elt_bytes);
 
   h = sparse_vec_header (v);
 
@@ -226,7 +225,10 @@ sparse_vec_index2 (void *v,
     {                                                                         \
       if (V)                                                                  \
        {                                                                     \
-         clib_mem_free (sparse_vec_header (V));                              \
+         sparse_vec_header_t *_h = sparse_vec_header (V);                    \
+         vec_free (_h->is_member_bitmap);                                    \
+         vec_free (_h->member_counts);                                       \
+         clib_mem_free (_h);                                                 \
          V = 0;                                                              \
        }                                                                     \
     }                                                                         \