diff options
| author | Phil Sutter <phil@nwl.cc> | 2025-10-17 16:11:14 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2025-10-23 22:48:51 +0200 |
| commit | 134b50e5d3f185219e09c613d98d6bf9494b1248 (patch) | |
| tree | e69e2b1863fd1f168bd4f4bc8a3b91600a2124c3 /src | |
| parent | ae052a6565f9e9a62ba68d0cbdd1993015310100 (diff) | |
netlink: No need to reference array when passing as pointer
Struct nft_data_linearize::value is an array, drop the reference
operator.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src')
| -rw-r--r-- | src/netlink.c | 6 | ||||
| -rw-r--r-- | src/netlink_linearize.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/netlink.c b/src/netlink.c index 5511d988..7882381e 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -139,17 +139,17 @@ struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set, netlink_gen_key(key, &nld); key->flags &= ~EXPR_F_INTERVAL; - nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, &nld.value, nld.len); + nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, nld.value, nld.len); key->flags |= EXPR_F_INTERVAL_END; netlink_gen_key(key, &nld); key->flags &= ~EXPR_F_INTERVAL_END; nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY_END, - &nld.value, nld.len); + nld.value, nld.len); } else { netlink_gen_key(key, &nld); - nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, &nld.value, nld.len); + nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, nld.value, nld.len); } break; } diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index d01cadf8..43cfbfa7 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -482,8 +482,8 @@ static struct expr *netlink_gen_prefix(struct netlink_linearize_ctx *ctx, netlink_put_register(nle, NFTNL_EXPR_BITWISE_SREG, sreg); netlink_put_register(nle, NFTNL_EXPR_BITWISE_DREG, sreg); nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_LEN, nld.len); - nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, &nld.value, nld.len); - nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, &zero.value, zero.len); + nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, nld.value, nld.len); + nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, zero.value, zero.len); nft_rule_add_expr(ctx, nle, &expr->location); return expr->right->prefix; @@ -558,8 +558,8 @@ static void netlink_gen_flagcmp(struct netlink_linearize_ctx *ctx, netlink_put_register(nle, NFTNL_EXPR_BITWISE_SREG, sreg); netlink_put_register(nle, NFTNL_EXPR_BITWISE_DREG, sreg); nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_LEN, len); - nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, &nld2.value, nld2.len); - nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, &nld.value, nld.len); + nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, nld2.value, nld2.len); + nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, nld.value, nld.len); nft_rule_add_expr(ctx, nle, &expr->location); nle = alloc_nft_expr("cmp"); |