libbpf, hashmap: Fix signedness warnings
authorIan Rogers <irogers@google.com>
Fri, 15 May 2020 16:50:03 +0000 (09:50 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 15 May 2020 23:06:05 +0000 (01:06 +0200)
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
tools/lib/bpf/hashmap.c

index cffb962..a405dad 100644 (file)
@@ -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)