From 41a1bbffc6238b0ed52b55f58ba884fe2f26e11f Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Fri, 11 Mar 2022 10:58:55 -0800 Subject: vppinfra: fix vec capacity Rename vec_capacity to vec_mem_size as it returned the size of the underlying memory allocation not the number of bytes that can be used for vector elements. Add new vec_max_elts macro that returns number of elements that can fit into generic vector. Type: fix Signed-off-by: Florin Coras Change-Id: I2e53a2bfa6e56a89af62d6ddc073ead58b8c49bb --- src/vppinfra/hash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vppinfra/hash.c') diff --git a/src/vppinfra/hash.c b/src/vppinfra/hash.c index c7774bb87ef..63dab989852 100644 --- a/src/vppinfra/hash.c +++ b/src/vppinfra/hash.c @@ -1003,7 +1003,7 @@ hash_bytes (void *v) if (!v) return 0; - bytes = vec_capacity (v, hash_header_bytes (v)); + bytes = vec_mem_size (v, hash_header_bytes (v)); for (i = 0; i < hash_capacity (v); i++) { @@ -1013,7 +1013,7 @@ hash_bytes (void *v) if (h->log2_pair_size > 0) bytes += 1 << indirect_pair_get_log2_bytes (&p->indirect); else - bytes += vec_capacity (p->indirect.pairs, 0); + bytes += vec_mem_size (p->indirect.pairs, 0); } } return bytes; -- cgit 1.2.3-korg