From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 10 Oct 2018 13:08:25 +0000 (+0200)
Subject: src: remove netlink_flush_table()
X-Git-Tag: v0.9.1~240
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1e932eedef7c8b8683c15a419bace8794d1b5e4;p=thirdparty%2Fnftables.git

src: remove netlink_flush_table()

Just a simple wrapper function, replace it by direct call to
mnl_nft_rule_del().

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

diff --git a/include/netlink.h b/include/netlink.h
index 57e1d98a..e27d75ea 100644
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -114,7 +114,6 @@ extern struct chain *netlink_delinearize_chain(struct netlink_ctx *ctx,
 
 extern int netlink_list_tables(struct netlink_ctx *ctx, const struct handle *h);
 extern int netlink_list_table(struct netlink_ctx *ctx, const struct handle *h);
-extern int netlink_flush_table(struct netlink_ctx *ctx, const struct cmd *cmd);
 extern struct table *netlink_delinearize_table(struct netlink_ctx *ctx,
 					       const struct nftnl_table *nlt);
 
diff --git a/src/netlink.c b/src/netlink.c
index 3cf42351..60635054 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -444,11 +444,6 @@ static int netlink_list_rules(struct netlink_ctx *ctx, const struct handle *h)
 	return 0;
 }
 
-static int netlink_flush_rules(struct netlink_ctx *ctx, const struct cmd *cmd)
-{
-	return mnl_nft_rule_del(ctx, cmd);
-}
-
 void netlink_dump_chain(const struct nftnl_chain *nlc, struct netlink_ctx *ctx)
 {
 	FILE *fp = ctx->octx->output_fp;
@@ -593,11 +588,6 @@ int netlink_list_table(struct netlink_ctx *ctx, const struct handle *h)
 	return netlink_list_rules(ctx, h);
 }
 
-int netlink_flush_table(struct netlink_ctx *ctx, const struct cmd *cmd)
-{
-	return netlink_flush_rules(ctx, cmd);
-}
-
 enum nft_data_types dtype_map_to_kernel(const struct datatype *dtype)
 {
 	switch (dtype->type) {
diff --git a/src/rule.c b/src/rule.c
index 5ef84f79..34ce7693 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -2259,7 +2259,7 @@ static int do_command_flush(struct netlink_ctx *ctx, struct cmd *cmd)
 {
 	switch (cmd->obj) {
 	case CMD_OBJ_TABLE:
-		return netlink_flush_table(ctx, cmd);
+		return mnl_nft_rule_del(ctx, cmd);
 	case CMD_OBJ_CHAIN:
 		return netlink_flush_chain(ctx, cmd);
 	case CMD_OBJ_SET: