From: Carlos Falgueras García <carlosfg@riseup.net>
Date: Wed, 10 Aug 2016 09:48:54 +0000 (+0200)
Subject: rule: Implement internal iterator for expressions
X-Git-Tag: libnftnl-1.0.7~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ccd4e72d3dfff000d8212ae63f45cd950bb53b;p=thirdparty%2Flibnftnl.git

rule: Implement internal iterator for expressions

Introduce nftnl_expr_iter_init() to allow stack allocated iterators for
internal use.

Signed-off-by: Carlos Falgueras García <carlosfg@riseup.net>
---

diff --git a/src/rule.c b/src/rule.c
index 21039bb8..dada00e1 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -1030,6 +1030,17 @@ struct nftnl_expr_iter {
 	struct nftnl_expr	*cur;
 };
 
+static void nftnl_expr_iter_init(const struct nftnl_rule *r,
+				 struct nftnl_expr_iter *iter)
+{
+	iter->r = r;
+	if (list_empty(&r->expr_list))
+		iter->cur = NULL;
+	else
+		iter->cur = list_entry(r->expr_list.next, struct nftnl_expr,
+				       head);
+}
+
 struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r)
 {
 	struct nftnl_expr_iter *iter;
@@ -1038,12 +1049,7 @@ struct nftnl_expr_iter *nftnl_expr_iter_create(const struct nftnl_rule *r)
 	if (iter == NULL)
 		return NULL;
 
-	iter->r = r;
-	if (list_empty(&r->expr_list))
-		iter->cur = NULL;
-	else
-		iter->cur = list_entry(r->expr_list.next, struct nftnl_expr,
-				       head);
+	nftnl_expr_iter_init(r, iter);
 
 	return iter;
 }