src: rename existing functions to use the nftnl_ prefix

So we can use the nft_* prefix anytime soon for our upcoming higher level
library.

After this patch, the nft_* symbols become an alias of the nftnl_* symbols.

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

1 files changed, 20 insertions, 20 deletions

diff --git a/tests/nft-table-test.c b/tests/nft-table-test.c
index 2096ea5..9ae8f48 100644
--- a/tests/nft-table-test.c
+++ b/tests/nft-table-test.c
@@ -24,16 +24,16 @@ static void print_err(const char *msg)
 	printf("\033[31mERROR:\e[0m %s\n", msg);
 }
 
-static void cmp_nft_table(struct nft_table *a, struct nft_table *b)
+static void cmp_nftnl_table(struct nftnl_table *a, struct nftnl_table *b)
 {
-	if (strcmp(nft_table_attr_get_str(a, NFT_TABLE_ATTR_NAME),
-		   nft_table_attr_get_str(b, NFT_TABLE_ATTR_NAME)) != 0)
+	if (strcmp(nftnl_table_attr_get_str(a, NFTNL_TABLE_ATTR_NAME),
+		   nftnl_table_attr_get_str(b, NFTNL_TABLE_ATTR_NAME)) != 0)
 		print_err("table name mismatches");
-	if (nft_table_attr_get_u32(a, NFT_TABLE_ATTR_FLAGS) !=
-	    nft_table_attr_get_u32(b, NFT_TABLE_ATTR_FLAGS))
+	if (nftnl_table_attr_get_u32(a, NFTNL_TABLE_ATTR_FLAGS) !=
+	    nftnl_table_attr_get_u32(b, NFTNL_TABLE_ATTR_FLAGS))
 		print_err("table flags mismatches");
-	if (nft_table_attr_get_u32(a, NFT_TABLE_ATTR_FAMILY) !=
-	    nft_table_attr_get_u32(b, NFT_TABLE_ATTR_FAMILY))
+	if (nftnl_table_attr_get_u32(a, NFTNL_TABLE_ATTR_FAMILY) !=
+	    nftnl_table_attr_get_u32(b, NFTNL_TABLE_ATTR_FAMILY))
 		print_err("tabke family mismatches");
 }
 
@@ -42,30 +42,30 @@ int main(int argc, char *argv[])
 	char buf[4096];
 	struct nlmsghdr *nlh;
 
-	struct nft_table *a = NULL;
-	struct nft_table *b = NULL;
-	a = nft_table_alloc();
-	b = nft_table_alloc();
+	struct nftnl_table *a = NULL;
+	struct nftnl_table *b = NULL;
+	a = nftnl_table_alloc();
+	b = nftnl_table_alloc();
 
 	if (a == NULL || b == NULL)
 		print_err("OOM");
 
-	nft_table_attr_set_str(a, NFT_TABLE_ATTR_NAME, "test");
-	nft_table_attr_set_u32(a, NFT_TABLE_ATTR_FAMILY, AF_INET);
-	nft_table_attr_set_u32(a, NFT_TABLE_ATTR_FLAGS, 0);
+	nftnl_table_attr_set_str(a, NFTNL_TABLE_ATTR_NAME, "test");
+	nftnl_table_attr_set_u32(a, NFTNL_TABLE_ATTR_FAMILY, AF_INET);
+	nftnl_table_attr_set_u32(a, NFTNL_TABLE_ATTR_FLAGS, 0);
 
 	/* cmd extracted from include/linux/netfilter/nf_tables.h */
-	nlh = nft_table_nlmsg_build_hdr(buf, NFT_MSG_NEWTABLE, AF_INET, 0,
+	nlh = nftnl_table_nlmsg_build_hdr(buf, NFT_MSG_NEWTABLE, AF_INET, 0,
 					1234);
-	nft_table_nlmsg_build_payload(nlh, a);
+	nftnl_table_nlmsg_build_payload(nlh, a);
 
-	if (nft_table_nlmsg_parse(nlh, b) < 0)
+	if (nftnl_table_nlmsg_parse(nlh, b) < 0)
 		print_err("parsing problems");
 
-	cmp_nft_table(a,b);
+	cmp_nftnl_table(a,b);
 
-	nft_table_free(a);
-	nft_table_free(b);
+	nftnl_table_free(a);
+	nftnl_table_free(b);
 	if (!test_ok)
 		exit(EXIT_FAILURE);