]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
nft: ruleparse: Drop 'iter' variable in nft_rule_to_iptables_command_state
authorPhil Sutter <phil@nwl.cc>
Tue, 30 Jul 2024 23:58:27 +0000 (01:58 +0200)
committerPhil Sutter <phil@nwl.cc>
Wed, 14 Aug 2024 07:50:31 +0000 (09:50 +0200)
Use the same named field in 'ctx' instead, it has to carry the value
anyway.

Signed-off-by: Phil Sutter <phil@nwl.cc>
iptables/nft-ruleparse.c

index 3b1cbe4fa14990d77a14d622b8dd34a94b61606d..1ee7a94db59de21c4dd41b488df86652add0fe65 100644 (file)
@@ -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;