Commit 8d35d74f authored by Ian Rogers's avatar Ian Rogers Committed by Daniel Borkmann

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: default avatarIan Rogers <irogers@google.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200515165007.217120-4-irogers@google.com
parent f516acd5
...@@ -60,7 +60,7 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn, ...@@ -60,7 +60,7 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn,
void hashmap__clear(struct hashmap *map) void hashmap__clear(struct hashmap *map)
{ {
struct hashmap_entry *cur, *tmp; struct hashmap_entry *cur, *tmp;
int bkt; size_t bkt;
hashmap__for_each_entry_safe(map, cur, tmp, bkt) { hashmap__for_each_entry_safe(map, cur, tmp, bkt) {
free(cur); free(cur);
...@@ -100,8 +100,7 @@ static int hashmap_grow(struct hashmap *map) ...@@ -100,8 +100,7 @@ static int hashmap_grow(struct hashmap *map)
struct hashmap_entry **new_buckets; struct hashmap_entry **new_buckets;
struct hashmap_entry *cur, *tmp; struct hashmap_entry *cur, *tmp;
size_t new_cap_bits, new_cap; size_t new_cap_bits, new_cap;
size_t h; size_t h, bkt;
int bkt;
new_cap_bits = map->cap_bits + 1; new_cap_bits = map->cap_bits + 1;
if (new_cap_bits < HASHMAP_MIN_CAP_BITS) if (new_cap_bits < HASHMAP_MIN_CAP_BITS)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment