From 4e2baaee88de7e92b10e646b2756936b9784fdcb Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 31 Jul 2024 01:58:27 +0200 Subject: nft: ruleparse: Drop 'iter' variable in nft_rule_to_iptables_command_state Use the same named field in 'ctx' instead, it has to carry the value anyway. Signed-off-by: Phil Sutter --- iptables/nft-ruleparse.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/iptables/nft-ruleparse.c b/iptables/nft-ruleparse.c index 3b1cbe4f..1ee7a94d 100644 --- a/iptables/nft-ruleparse.c +++ b/iptables/nft-ruleparse.c @@ -891,7 +891,6 @@ bool nft_rule_to_iptables_command_state(struct nft_handle *h, const struct nftnl_rule *r, struct iptables_command_state *cs) { - struct nftnl_expr_iter *iter; struct nftnl_expr *expr; struct nft_xt_ctx ctx = { .cs = cs, @@ -900,12 +899,11 @@ bool nft_rule_to_iptables_command_state(struct nft_handle *h, }; bool ret = true; - iter = nftnl_expr_iter_create(r); - if (iter == NULL) + ctx.iter = nftnl_expr_iter_create(r); + if (ctx.iter == NULL) return false; - ctx.iter = iter; - expr = nftnl_expr_iter_next(iter); + expr = nftnl_expr_iter_next(ctx.iter); while (expr != NULL) { const char *name = nftnl_expr_get_str(expr, NFTNL_EXPR_NAME); @@ -941,10 +939,10 @@ bool nft_rule_to_iptables_command_state(struct nft_handle *h, ret = false; } - expr = nftnl_expr_iter_next(iter); + expr = nftnl_expr_iter_next(ctx.iter); } - nftnl_expr_iter_destroy(iter); + nftnl_expr_iter_destroy(ctx.iter); if (nftnl_rule_is_set(r, NFTNL_RULE_USERDATA)) { const void *data; -- cgit v1.2.3