1 files changed, 24 insertions, 24 deletions

diff --git a/tests/nft-expr_cmp-test.c b/tests/nft-expr_cmp-test.c
index b9df3c6..23292c9 100644
--- a/tests/nft-expr_cmp-test.c
+++ b/tests/nft-expr_cmp-test.c
@@ -27,44 +27,44 @@ static void print_err(const char *msg)
 	printf("\033[31mERROR:\e[0m %s\n", msg);
 }
 
-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 data_lena, data_lenb;
 
-	nftnl_rule_expr_get(rule_a, NFTNL_EXPR_CMP_DATA, &data_lena);
-	nftnl_rule_expr_get(rule_b, NFTNL_EXPR_CMP_DATA, &data_lenb);
+	nftnl_expr_get(rule_a, NFTNL_EXPR_CMP_DATA, &data_lena);
+	nftnl_expr_get(rule_b, NFTNL_EXPR_CMP_DATA, &data_lenb);
 	if (data_lena != data_lenb)
 		print_err("Size of NFTNL_EXPR_CMP_DATA mismatches");
-	if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CMP_SREG) !=
-	    nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CMP_SREG))
+	if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CMP_SREG) !=
+	    nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CMP_SREG))
 		print_err("Expr NFTNL_EXPR_CMP_SREG mismatches");
-	if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_CMP_OP) !=
-	    nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_CMP_OP))
+	if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_CMP_OP) !=
+	    nftnl_expr_get_u32(rule_b, NFTNL_EXPR_CMP_OP))
 		print_err("Expr NFTNL_EXPR_CMP_OP mismatches");
 }
 
 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;
 	uint32_t data_len = 0x01010101;
 
 	a = nftnl_rule_alloc();
 	b = nftnl_rule_alloc();
 	if (a == NULL || b == NULL)
 		print_err("OOM");
-	ex = nftnl_rule_expr_alloc("cmp");
+	ex = nftnl_expr_alloc("cmp");
 	if (ex == NULL)
 		print_err("OOM");
 
-	nftnl_rule_expr_set(ex, NFTNL_EXPR_CMP_DATA, &data_len, sizeof(data_len));
-	nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CMP_SREG, 0x12345678);
-	nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x12345678);
+	nftnl_expr_set(ex, NFTNL_EXPR_CMP_DATA, &data_len, sizeof(data_len));
+	nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_SREG, 0x12345678);
+	nftnl_expr_set_u32(ex, NFTNL_EXPR_CMP_OP, 0x12345678);
 
 	nftnl_rule_add_expr(a, ex);
 
@@ -74,23 +74,23 @@ 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);