libbpf: fix some typo of hashmap init
PATCH 1/1 libbpf: fix some typo of hashmap init
rename macro parameters to prevent replacing struct members of hashmap
Signed-off-by John Sanpe <[email protected]>
--- tools/lib/bpf/hashmap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/lib/bpf/hashmap.h +8 -8
@@ -80,14 +80,14 @@ struct hashmap {size_t sz; }; -#define HASHMAP_INIT (hash_fn, equal_fn, ctx) { \ - .hash_fn = (hash_fn), \ - .equal_fn = (equal_fn), \ - .ctx = (ctx), \ - .buckets = NULL, \ - .cap = 0, \ - .cap_bits = 0, \ - .sz = 0, \ +#define HASHMAP_INIT (_hash_fn, _equal_fn, _ctx) { \ + .hash_fn = (_hash_fn), \ + .equal_fn = (_equal_fn), \ + .ctx = (_ctx), \ + .buckets = NULL, \ + .cap = 0, \ + .cap_bits = 0, \ + .sz = 0, \ } void hashmap__init(struct hashmap *map, hashmap_hash_fn hash_fn,
Signature · 1 line
2.40.1
Daniel Borkmann
maintainerQuoted 25 lines · John Sanpe
rename macro parameters to prevent replacing struct members of hashmap
Signed-off-by John Sanpe <[email protected]>--- tools/lib/bpf/hashmap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)tools/lib/bpf/hashmap.h +1
-8@@ -80,14 +80,14 @@ struct hashmap {size_t sz; }; -#define HASHMAP_INIT (hash_fn, equal_fn, ctx) { \ - .hash_fn = (hash_fn), \ - .equal_fn = (equal_fn), \ - .ctx = (ctx), \ - .buckets = NULL, \ - .cap = 0, \ - .cap_bits = 0, \ - .sz = 0, \ +#define HASHMAP_INIT (_hash_fn, _equal_fn, _ctx) { \
tools/lib/bpf/hashmap.h struct hashmap { · line 93
Quoted 10 lines
tools/lib/bpf/hashmap.h +7
-0+ .hash_fn = (_hash_fn), \ + .equal_fn = (_equal_fn), \ + .ctx = (_ctx), \ + .buckets = NULL, \ + .cap = 0, \ + .cap_bits = 0, \ + .sz = 0, \ } void hashmap__init(struct hashmap *map, hashmap_hash_fn hash_fn,
Please send a v2 and just remove the whole HASHMAP_INIT. It's not used anywhere in libbpf.