2023-07-04 09:34:26

by John Sanpe

Subject: [PATCH] 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(-)

diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h
index 0a5bf1937a7c..bae3feaf29d0 100644
--- a/tools/lib/bpf/hashmap.h
+++ b/tools/lib/bpf/hashmap.h
@@ -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,
--
2.40.1

2023-07-04 09:35:44

by Daniel Borkmann

Subject: Re: [PATCH] libbpf: fix some typo of hashmap init

On 7/4/23 10:54 AM, John Sanpe wrote:
> 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(-)
>
> diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h
> index 0a5bf1937a7c..bae3feaf29d0 100644
> --- a/tools/lib/bpf/hashmap.h
> +++ b/tools/lib/bpf/hashmap.h
> @@ -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,
>

Please send a v2 and just remove the whole HASHMAP_INIT. It's not used
anywhere in libbpf.