From 325cb6f592cda0e9fb1769e4ebd209616fc7e6a1 Mon Sep 17 00:00:00 2001
From: Brett Mastbergen <bmastbergen@untangle.com>
Date: Fri, 3 Jan 2020 14:36:40 -0500
Subject: include: Remove buffer.h

Almost everything in this header is unused.  The command defines
used in utils.c don't seem to be justified and have just been
replaced by their strings

Signed-off-by: Brett Mastbergen <bmastbergen@untangle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/chain.c       |  1 -
 src/common.c      |  1 -
 src/expr/dup.c    |  1 -
 src/expr/dynset.c |  1 -
 src/expr/fwd.c    |  1 -
 src/flowtable.c   |  1 -
 src/object.c      |  1 -
 src/rule.c        |  1 -
 src/table.c       |  1 -
 src/utils.c       | 20 ++++++++++----------
 10 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/chain.c b/src/chain.c
index b9a16fc..b4066e4 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -28,7 +28,6 @@
 
 #include <libnftnl/chain.h>
 #include <libnftnl/rule.h>
-#include <buffer.h>
 
 struct nftnl_chain {
 	struct list_head head;
diff --git a/src/common.c b/src/common.c
index feb13b2..2d83c12 100644
--- a/src/common.c
+++ b/src/common.c
@@ -17,7 +17,6 @@
 #include <libmnl/libmnl.h>
 #include <libnftnl/common.h>
 #include <libnftnl/set.h>
-#include <buffer.h>
 
 #include <errno.h>
 #include "internal.h"
diff --git a/src/expr/dup.c b/src/expr/dup.c
index 2bb35e5..ac39839 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -19,7 +19,6 @@
 #include <libnftnl/rule.h>
 #include "expr_ops.h"
 #include "data_reg.h"
-#include <buffer.h>
 
 struct nftnl_expr_dup {
 	enum nft_registers	sreg_addr;
diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 4870923..b2d8edc 100644
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -20,7 +20,6 @@
 #include <libnftnl/expr.h>
 #include "data_reg.h"
 #include "expr_ops.h"
-#include <buffer.h>
 
 struct nftnl_expr_dynset {
 	enum nft_registers	sreg_key;
diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index cff8235..2ec63c1 100644
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -19,7 +19,6 @@
 #include <libnftnl/rule.h>
 #include "expr_ops.h"
 #include "data_reg.h"
-#include <buffer.h>
 
 struct nftnl_expr_fwd {
 	enum nft_registers	sreg_dev;
diff --git a/src/flowtable.c b/src/flowtable.c
index 9ba3b6d..1e235d0 100644
--- a/src/flowtable.c
+++ b/src/flowtable.c
@@ -17,7 +17,6 @@
 #include <linux/netfilter_arp.h>
 
 #include <libnftnl/flowtable.h>
-#include <buffer.h>
 
 struct nftnl_flowtable {
 	struct list_head	head;
diff --git a/src/object.c b/src/object.c
index c876add..4f58272 100644
--- a/src/object.c
+++ b/src/object.c
@@ -22,7 +22,6 @@
 #include <linux/netfilter/nf_tables.h>
 
 #include <libnftnl/object.h>
-#include <buffer.h>
 #include "obj.h"
 
 static struct obj_ops *obj_ops[__NFT_OBJECT_MAX] = {
diff --git a/src/rule.c b/src/rule.c
index 252410b..8d7e068 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -20,7 +20,6 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <buffer.h>
 
 #include <libmnl/libmnl.h>
 #include <linux/netfilter/nfnetlink.h>
diff --git a/src/table.c b/src/table.c
index adcfafe..94d522b 100644
--- a/src/table.c
+++ b/src/table.c
@@ -24,7 +24,6 @@
 #include <linux/netfilter/nf_tables.h>
 
 #include <libnftnl/table.h>
-#include <buffer.h>
 
 struct nftnl_table {
 	struct list_head head;
diff --git a/src/utils.c b/src/utils.c
index f641bf9..3617837 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -242,11 +242,11 @@ enum nftnl_cmd_type nftnl_flag2cmd(uint32_t flags)
 }
 
 static const char *cmd2tag[NFTNL_CMD_MAX] = {
-	[NFTNL_CMD_ADD]			= ADD,
-	[NFTNL_CMD_INSERT]		= INSERT,
-	[NFTNL_CMD_DELETE]		= DELETE,
-	[NFTNL_CMD_REPLACE]		= REPLACE,
-	[NFTNL_CMD_FLUSH]			= FLUSH,
+	[NFTNL_CMD_ADD]			= "add",
+	[NFTNL_CMD_INSERT]		= "insert",
+	[NFTNL_CMD_DELETE]		= "delete",
+	[NFTNL_CMD_REPLACE]		= "replace",
+	[NFTNL_CMD_FLUSH]			= "flush",
 };
 
 const char *nftnl_cmd2tag(enum nftnl_cmd_type cmd)
@@ -259,15 +259,15 @@ const char *nftnl_cmd2tag(enum nftnl_cmd_type cmd)
 
 uint32_t nftnl_str2cmd(const char *cmd)
 {
-	if (strcmp(cmd, ADD) == 0)
+	if (strcmp(cmd, "add") == 0)
 		return NFTNL_CMD_ADD;
-	else if (strcmp(cmd, INSERT) == 0)
+	else if (strcmp(cmd, "insert") == 0)
 		return NFTNL_CMD_INSERT;
-	else if (strcmp(cmd, DELETE) == 0)
+	else if (strcmp(cmd, "delete") == 0)
 		return NFTNL_CMD_DELETE;
-	else if (strcmp(cmd, REPLACE) == 0)
+	else if (strcmp(cmd, "replace") == 0)
 		return NFTNL_CMD_REPLACE;
-	else if (strcmp(cmd, FLUSH) == 0)
+	else if (strcmp(cmd, "flush") == 0)
 		return NFTNL_CMD_FLUSH;
 
 	return NFTNL_CMD_UNSPEC;
-- 
cgit v1.2.3