Commit 8d35d74f authored May 15, 2020 by Ian Rogers Committed by Daniel Borkmann May 16, 2020

libbpf, hashmap: Fix signedness warnings

Fixes the following warnings:

hashmap.c: In function ‘hashmap__clear’:
hashmap.h:150:20: error: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Werror=sign-compare]
150 | for (bkt = 0; bkt < map->cap; bkt++) \

hashmap.c: In function ‘hashmap_grow’:
hashmap.h:150:20: error: comparison of integer expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned int’} [-Werror=sign-compare]
150 | for (bkt = 0; bkt < map->cap; bkt++) \

Signed-off-by: Ian Rogers <irogers@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200515165007.217120-4-irogers@google.com

parent f516acd5

tools/lib/bpf/hashmap.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
		void hashmap__clear(struct hashmap *map)
		{
		struct hashmap_entry cur, tmp;
		int bkt;
		size_t bkt;

		hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
		free(cur);
		@@ -100,8 +100,7 @@ static int hashmap_grow(struct hashmap *map)
		struct hashmap_entry **new_buckets;
		struct hashmap_entry cur, tmp;
		size_t new_cap_bits, new_cap;
		size_t h;
		int bkt;
		size_t h, bkt;

		new_cap_bits = map->cap_bits + 1;
		if (new_cap_bits < HASHMAP_MIN_CAP_BITS)

Admin message