1 files changed, 27 insertions, 27 deletions

diff --git a/tests/nft-expr_log-test.c b/tests/nft-expr_log-test.c
index d231d84..3815778 100644
--- a/tests/nft-expr_log-test.c
+++ b/tests/nft-expr_log-test.c
@@ -27,44 +27,44 @@ static void print_err(const char *msg)
 	test_ok = 0;
 }
 
-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)
 {
-	if (nftnl_rule_expr_get_u32(rule_a, NFTNL_EXPR_LOG_SNAPLEN) !=
-	    nftnl_rule_expr_get_u32(rule_b, NFTNL_EXPR_LOG_SNAPLEN))
+	if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_LOG_SNAPLEN) !=
+	    nftnl_expr_get_u32(rule_b, NFTNL_EXPR_LOG_SNAPLEN))
 		print_err("Expr NFTNL_EXPR_LOG_SNAPLEN mismatches");
-	if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_LOG_GROUP) !=
-	    nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_LOG_GROUP))
+	if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_LOG_GROUP) !=
+	    nftnl_expr_get_u16(rule_b, NFTNL_EXPR_LOG_GROUP))
 		print_err("Expr NFTNL_EXPR_LOG_GROUP mismatches");
-	if (nftnl_rule_expr_get_u16(rule_a, NFTNL_EXPR_LOG_QTHRESHOLD) !=
-	    nftnl_rule_expr_get_u16(rule_b, NFTNL_EXPR_LOG_QTHRESHOLD))
+	if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_LOG_QTHRESHOLD) !=
+	    nftnl_expr_get_u16(rule_b, NFTNL_EXPR_LOG_QTHRESHOLD))
 		print_err("Expr NFTNL_EXPR_LOG_QTHRESHOLD mismatches");
-	if(strcmp(nftnl_rule_expr_get_str(rule_a, NFTNL_EXPR_LOG_PREFIX),
-		  nftnl_rule_expr_get_str(rule_b, NFTNL_EXPR_LOG_PREFIX)) != 0)
+	if(strcmp(nftnl_expr_get_str(rule_a, NFTNL_EXPR_LOG_PREFIX),
+		  nftnl_expr_get_str(rule_b, NFTNL_EXPR_LOG_PREFIX)) != 0)
 		print_err("Expr NFTNL_EXPR_LOG_PREFIX 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;
 
 	a = nftnl_rule_alloc();
 	b = nftnl_rule_alloc();
 	if (a == NULL || b == NULL)
 		print_err("OOM");
-	ex = nftnl_rule_expr_alloc("log");
+	ex = nftnl_expr_alloc("log");
 	if (ex == NULL)
 		print_err("OOM");
 
-	nftnl_rule_expr_set_u32(ex, NFTNL_EXPR_LOG_SNAPLEN, 0x12345678);
-	nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_LOG_GROUP, 0x1234);
-	nftnl_rule_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x1234);
-	nftnl_rule_expr_set_str(ex, NFTNL_EXPR_LOG_PREFIX, "test");
+	nftnl_expr_set_u32(ex, NFTNL_EXPR_LOG_SNAPLEN, 0x12345678);
+	nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_GROUP, 0x1234);
+	nftnl_expr_set_u16(ex, NFTNL_EXPR_LOG_QTHRESHOLD, 0x1234);
+	nftnl_expr_set_str(ex, NFTNL_EXPR_LOG_PREFIX, "test");
 
 	nftnl_rule_add_expr(a, ex);
 
@@ -73,23 +73,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);