]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
mnl: rename list of expression in mnl_nft_setelem_batch()
authorPablo Neira Ayuso <pablo@netfilter.org>
Fri, 3 Jan 2025 16:40:58 +0000 (17:40 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 10 Jan 2025 10:21:02 +0000 (11:21 +0100)
Rename set to init to prepare to pass struct set to this function in
the follow up patch. No functional changes are intended.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/mnl.c

index 88fac5bd0393a93628ebd7282bfe09b16022251e..52085d6d960a27f5e912ae7bab607075514b5f50 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -1731,7 +1731,7 @@ static int mnl_nft_setelem_batch(const struct nftnl_set *nls, struct cmd *cmd,
                                 struct nftnl_batch *batch,
                                 enum nf_tables_msg_types msg_type,
                                 unsigned int flags, uint32_t *seqnum,
-                                const struct expr *set,
+                                const struct expr *init,
                                 struct netlink_ctx *ctx)
 {
        struct nlattr *nest1, *nest2;
@@ -1743,8 +1743,8 @@ static int mnl_nft_setelem_batch(const struct nftnl_set *nls, struct cmd *cmd,
        if (msg_type == NFT_MSG_NEWSETELEM)
                flags |= NLM_F_CREATE;
 
-       if (set)
-               expr = list_first_entry(&set->expressions, struct expr, list);
+       if (init)
+               expr = list_first_entry(&init->expressions, struct expr, list);
 
 next:
        nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(batch), msg_type,
@@ -1764,13 +1764,13 @@ next:
                                 htonl(nftnl_set_get_u32(nls, NFTNL_SET_ID)));
        }
 
-       if (!set || list_empty(&set->expressions))
+       if (!init || list_empty(&init->expressions))
                return 0;
 
        assert(expr);
        nest1 = mnl_attr_nest_start(nlh, NFTA_SET_ELEM_LIST_ELEMENTS);
-       list_for_each_entry_from(expr, &set->expressions, list) {
-               nlse = alloc_nftnl_setelem(set, expr);
+       list_for_each_entry_from(expr, &init->expressions, list) {
+               nlse = alloc_nftnl_setelem(init, expr);
 
                cmd_add_loc(cmd, nlh, &expr->location);
                nest2 = mnl_attr_nest_start(nlh, ++i);