src: rename nftnl_rule_expr to nftnl_expr

Use a shorter name for this, morever this can be used from sets so the _rule_
is misleading.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 24 insertions, 24 deletions

diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c
index 8b09357..634fc0a 100644
--- a/tests/nft-expr_target-test.c
+++ b/tests/nft-expr_target-test.c
@@ -33,19 +33,19 @@ static void print_err2(const char *msg, uint32_t a, uint32_t b)
 	printf("\033[31mERROR:\e[0m %s size a: %d b: %d \n",msg, a, b);
 }
 
-static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a,
-			      struct nftnl_rule_expr *rule_b)
+static void cmp_nftnl_expr(struct nftnl_expr *rule_a,
+			      struct nftnl_expr *rule_b)
 {
 	uint32_t lena, lenb;
 
-	if (strcmp(nftnl_rule_expr_get_str(rule_a, NFTNL_EXPR_TG_NAME),
-		   nftnl_rule_expr_get_str(rule_b, NFTNL_EXPR_TG_NAME)) != 0)
+	if (strcmp(nftnl_expr_get_str(rule_a, NFTNL_EXPR_TG_NAME),
+		   nftnl_expr_get_str(rule_b, NFTNL_EXPR_TG_NAME)) != 0)
 		print_err("Expr NFTNL_EXPR_TG_NAME mismatches");
-	if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_TG_REV) !=
-	    nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_TG_REV))
+	if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_TG_REV) !=
+	    nftnl_expr_get_u32(rule_b, NFTNL_EXPR_TG_REV))
 		print_err("Expr NFTNL_EXPR_TG_REV mismatches");
-	nftnl_rule_expr_get(rule_a, NFTNL_EXPR_TG_INFO, &lena);
-	nftnl_rule_expr_get(rule_b, NFTNL_EXPR_TG_INFO, &lenb);
+	nftnl_expr_get(rule_a, NFTNL_EXPR_TG_INFO, &lena);
+	nftnl_expr_get(rule_b, NFTNL_EXPR_TG_INFO, &lenb);
 	if (lena != lenb)
 		print_err2("Expr NFTNL_EXPR_TG_INFO size mismatches", lena, lenb);
 }
@@ -53,11 +53,11 @@ static void cmp_nftnl_rule_expr(struct nftnl_rule_expr *rule_a,
 int main(int argc, char *argv[])
 {
 	struct nftnl_rule *a, *b;
-	struct nftnl_rule_expr *ex;
+	struct nftnl_expr *ex;
 	struct nlmsghdr *nlh;
 	char buf[4096];
-	struct nftnl_rule_expr_iter *iter_a, *iter_b;
-	struct nftnl_rule_expr *rule_a, *rule_b;
+	struct nftnl_expr_iter *iter_a, *iter_b;
+	struct nftnl_expr *rule_a, *rule_b;
 	char data[16] = "0123456789abcdef";
 
 	a = nftnl_rule_alloc();
@@ -65,13 +65,13 @@ int main(int argc, char *argv[])
 	if (a == NULL || b == NULL)
 		print_err("OOM");
 
-	ex = nftnl_rule_expr_alloc("target");
+	ex = nftnl_expr_alloc("target");
 	if (ex == NULL)
 		print_err("OOM");
 
-	nftnl_rule_expr_set(ex, NFTNL_EXPR_TG_NAME, "test", strlen("test"));
-	nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x12345678);
-	nftnl_rule_expr_set(ex, NFTNL_EXPR_TG_INFO, strdup(data), sizeof(data));
+	nftnl_expr_set(ex, NFTNL_EXPR_TG_NAME, "test", strlen("test"));
+	nftnl_expr_set_u32(ex, NFTNL_EXPR_TG_REV, 0x12345678);
+	nftnl_expr_set(ex, NFTNL_EXPR_TG_INFO, strdup(data), sizeof(data));
 	nftnl_rule_add_expr(a, ex);
 
 	nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234);
@@ -80,24 +80,24 @@ int main(int argc, char *argv[])
 	if (nftnl_rule_nlmsg_parse(nlh, b) < 0)
 		print_err("parsing problems");
 
-	iter_a = nftnl_rule_expr_iter_create(a);
-	iter_b = nftnl_rule_expr_iter_create(b);
+	iter_a = nftnl_expr_iter_create(a);
+	iter_b = nftnl_expr_iter_create(b);
 	if (iter_a == NULL || iter_b == NULL)
 		print_err("OOM");
 
-	rule_a = nftnl_rule_expr_iter_next(iter_a);
-	rule_b = nftnl_rule_expr_iter_next(iter_b);
+	rule_a = nftnl_expr_iter_next(iter_a);
+	rule_b = nftnl_expr_iter_next(iter_b);
 	if (rule_a == NULL || rule_b == NULL)
 		print_err("OOM");
 
-	cmp_nftnl_rule_expr(rule_a, rule_b);
+	cmp_nftnl_expr(rule_a, rule_b);
 
-	if (nftnl_rule_expr_iter_next(iter_a) != NULL ||
-	    nftnl_rule_expr_iter_next(iter_b) != NULL)
+	if (nftnl_expr_iter_next(iter_a) != NULL ||
+	    nftnl_expr_iter_next(iter_b) != NULL)
 		print_err("More 1 expr.");
 
-	nftnl_rule_expr_iter_destroy(iter_a);
-	nftnl_rule_expr_iter_destroy(iter_b);
+	nftnl_expr_iter_destroy(iter_a);
+	nftnl_expr_iter_destroy(iter_b);
 	nftnl_rule_free(a);
 	nftnl_rule_free(b);