From: Florian Westphal <fw@strlen.de>
Date: Mon, 12 Mar 2018 11:58:59 +0000 (+0100)
Subject: netlink: use nftnl_flowtable_get/set
X-Git-Tag: v0.8.4~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71f755e54f034a048fdc0174b4309f1a6bde33d5;p=thirdparty%2Fnftables.git

netlink: use nftnl_flowtable_get/set

the '_array' variant is just a wrapper for get/set api; this
allows the array variant to be removed from libnftnl.

Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/src/netlink.c b/src/netlink.c
index a74dc255..bfa30502 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1588,7 +1588,7 @@ int netlink_add_flowtable(struct netlink_ctx *ctx, const struct handle *h,
 		dev_array[i++] = expr->identifier;
 
 	dev_array[i] = NULL;
-	nftnl_flowtable_set_array(flo, NFTNL_FLOWTABLE_DEVICES, dev_array);
+	nftnl_flowtable_set(flo, NFTNL_FLOWTABLE_DEVICES, dev_array);
 
 	netlink_dump_flowtable(flo, ctx);
 
@@ -1678,7 +1678,7 @@ netlink_delinearize_flowtable(struct netlink_ctx *ctx,
 			      struct nftnl_flowtable *nlo)
 {
 	struct flowtable *flowtable;
-	const char **dev_array;
+	const char * const *dev_array;
 	int len = 0, i;
 
 	flowtable = flowtable_alloc(&netlink_location);
@@ -1688,8 +1688,8 @@ netlink_delinearize_flowtable(struct netlink_ctx *ctx,
 		xstrdup(nftnl_flowtable_get_str(nlo, NFTNL_FLOWTABLE_TABLE));
 	flowtable->handle.flowtable =
 		xstrdup(nftnl_flowtable_get_str(nlo, NFTNL_FLOWTABLE_NAME));
-	dev_array = nftnl_flowtable_get_array(nlo, NFTNL_FLOWTABLE_DEVICES);
-	while (dev_array[len] != '\0')
+	dev_array = nftnl_flowtable_get(nlo, NFTNL_FLOWTABLE_DEVICES);
+	while (dev_array[len])
 		len++;
 
 	flowtable->dev_array = calloc(1, len * sizeof(char *));