summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-09-27 21:51:15 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2023-09-28 00:40:47 +0200
commita61f9f66f60f865f65be03374dc0277cce4f490a (patch)
tree556c7f703c5d847a6729833318a741eb5cf1d7e4 /src
parent223a2098c29b15caaa4540ece923ae63da9f98c0 (diff)
include: include <string.h> in <nft.h>
<string.h> provides strcmp(), as such it's very basic and used everywhere. Signed-off-by: Thomas Haller <thaller@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/cli.c1
-rw-r--r--src/cmd.c1
-rw-r--r--src/ct.c1
-rw-r--r--src/datatype.c1
-rw-r--r--src/erec.c1
-rw-r--r--src/evaluate.c1
-rw-r--r--src/expression.c1
-rw-r--r--src/exthdr.c1
-rw-r--r--src/fib.c1
-rw-r--r--src/gmputil.c1
-rw-r--r--src/iface.c1
-rw-r--r--src/json.c1
-rw-r--r--src/libnftables.c1
-rw-r--r--src/main.c1
-rw-r--r--src/meta.c1
-rw-r--r--src/mini-gmp.c1
-rw-r--r--src/misspell.c1
-rw-r--r--src/mnl.c1
-rw-r--r--src/monitor.c1
-rw-r--r--src/netlink.c1
-rw-r--r--src/netlink_delinearize.c1
-rw-r--r--src/netlink_linearize.c1
-rw-r--r--src/nfnl_osf.c1
-rw-r--r--src/nftutils.c1
-rw-r--r--src/optimize.c1
-rw-r--r--src/osf.c1
-rw-r--r--src/parser_json.c1
-rw-r--r--src/payload.c1
-rw-r--r--src/proto.c1
-rw-r--r--src/rt.c1
-rw-r--r--src/rule.c1
-rw-r--r--src/sctp_chunk.c1
-rw-r--r--src/segtree.c1
-rw-r--r--src/statement.c1
-rw-r--r--src/tcpopt.c1
-rw-r--r--src/utils.c1
-rw-r--r--src/xfrm.c1
-rw-r--r--src/xt.c1
38 files changed, 0 insertions, 38 deletions
diff --git a/src/cli.c b/src/cli.c
index e6971c10..448c25c2 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -18,7 +18,6 @@
#include <stdarg.h>
#include <unistd.h>
#include <errno.h>
-#include <string.h>
#include <ctype.h>
#include <limits.h>
#ifdef HAVE_LIBREADLINE
diff --git a/src/cmd.c b/src/cmd.c
index 358dd1f9..68c476c6 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -16,7 +16,6 @@
#include <iface.h>
#include <errno.h>
#include <cache.h>
-#include <string.h>
void cmd_add_loc(struct cmd *cmd, uint16_t offset, const struct location *loc)
{
diff --git a/src/ct.c b/src/ct.c
index b2635543..1dda799d 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -15,7 +15,6 @@
#include <stddef.h>
#include <stdio.h>
#include <inttypes.h>
-#include <string.h>
#include <netinet/ip.h>
#include <linux/netfilter.h>
diff --git a/src/datatype.c b/src/datatype.c
index f5d700bd..6fe46e89 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -10,7 +10,6 @@
#include <nft.h>
-#include <string.h>
#include <inttypes.h>
#include <ctype.h> /* isdigit */
#include <errno.h>
diff --git a/src/erec.c b/src/erec.c
index 8cadaa80..cd9f62be 100644
--- a/src/erec.c
+++ b/src/erec.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stdio.h>
-#include <string.h>
#include <stdarg.h>
#include <netlink.h>
diff --git a/src/evaluate.c b/src/evaluate.c
index c404e9a8..c699a9bc 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -12,7 +12,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
#include <linux/netfilter_arp.h>
diff --git a/src/expression.c b/src/expression.c
index c9147950..a21dfec2 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -12,7 +12,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <limits.h>
#include <expression.h>
diff --git a/src/exthdr.c b/src/exthdr.c
index 545370bd..60c7cd1e 100644
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -14,7 +14,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
diff --git a/src/fib.c b/src/fib.c
index b977fe28..e95271c9 100644
--- a/src/fib.c
+++ b/src/fib.c
@@ -16,7 +16,6 @@
#include <datatype.h>
#include <gmputil.h>
#include <utils.h>
-#include <string.h>
#include <fib.h>
#include <linux/rtnetlink.h>
diff --git a/src/gmputil.c b/src/gmputil.c
index bf472c65..cb26b558 100644
--- a/src/gmputil.c
+++ b/src/gmputil.c
@@ -14,7 +14,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
-#include <string.h>
#include <nftables.h>
#include <datatype.h>
diff --git a/src/iface.c b/src/iface.c
index e61ea2db..428acaae 100644
--- a/src/iface.c
+++ b/src/iface.c
@@ -11,7 +11,6 @@
#include <stdio.h>
#include <net/if.h>
#include <time.h>
-#include <string.h>
#include <errno.h>
#include <libmnl/libmnl.h>
diff --git a/src/json.c b/src/json.c
index 1be58221..068c423a 100644
--- a/src/json.c
+++ b/src/json.c
@@ -9,7 +9,6 @@
#include <nft.h>
#include <stdio.h>
-#include <string.h>
#include <expression.h>
#include <list.h>
diff --git a/src/libnftables.c b/src/libnftables.c
index 1ca5a6f4..4b4cf5b6 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -16,7 +16,6 @@
#include <iface.h>
#include <cmd.h>
#include <errno.h>
-#include <string.h>
static int nft_netlink(struct nft_ctx *nft,
struct list_head *cmds, struct list_head *msgs)
diff --git a/src/main.c b/src/main.c
index d7961894..9485b193 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,6 @@
#include <unistd.h>
#include <stdio.h>
#include <errno.h>
-#include <string.h>
#include <getopt.h>
#include <fcntl.h>
#include <sys/types.h>
diff --git a/src/meta.c b/src/meta.c
index 181e111c..b578d5e2 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -16,7 +16,6 @@
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <pwd.h>
diff --git a/src/mini-gmp.c b/src/mini-gmp.c
index 5d54df08..186dc3a4 100644
--- a/src/mini-gmp.c
+++ b/src/mini-gmp.c
@@ -47,7 +47,6 @@ see https://www.gnu.org/licenses/. */
#include <ctype.h>
#include <limits.h>
#include <stdio.h>
-#include <string.h>
#include "mini-gmp.h"
diff --git a/src/misspell.c b/src/misspell.c
index b48ab9cd..c1e58a0e 100644
--- a/src/misspell.c
+++ b/src/misspell.c
@@ -8,7 +8,6 @@
#include <nft.h>
-#include <string.h>
#include <limits.h>
#include <utils.h>
#include <misspell.h>
diff --git a/src/mnl.c b/src/mnl.c
index 67bb44a6..0fb36bd5 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -29,7 +29,6 @@
#include <mnl.h>
#include <cmd.h>
-#include <string.h>
#include <net/if.h>
#include <sys/socket.h>
#include <arpa/inet.h>
diff --git a/src/monitor.c b/src/monitor.c
index e6f4e15f..82762a0f 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -8,7 +8,6 @@
#include <nft.h>
-#include <string.h>
#include <fcntl.h>
#include <errno.h>
#include <libmnl/libmnl.h>
diff --git a/src/netlink.c b/src/netlink.c
index 8af579c7..120a8ba9 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -11,7 +11,6 @@
#include <nft.h>
-#include <string.h>
#include <errno.h>
#include <libmnl/libmnl.h>
#include <netinet/in.h>
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 41cb37a3..e2145104 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -11,7 +11,6 @@
#include <nft.h>
-#include <string.h>
#include <limits.h>
#include <linux/netfilter/nf_tables.h>
#include <arpa/inet.h>
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index c9121158..0c623411 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -14,7 +14,6 @@
#include <linux/netfilter/nf_tables.h>
#include <linux/netfilter/nf_log.h>
-#include <string.h>
#include <rule.h>
#include <statement.h>
#include <expression.h>
diff --git a/src/nfnl_osf.c b/src/nfnl_osf.c
index 38a27a36..20a1bfe7 100644
--- a/src/nfnl_osf.c
+++ b/src/nfnl_osf.c
@@ -25,7 +25,6 @@
#include <ctype.h>
#include <errno.h>
-#include <string.h>
#include <time.h>
#include <netinet/ip.h>
diff --git a/src/nftutils.c b/src/nftutils.c
index 9c7fe5ed..ca178aa0 100644
--- a/src/nftutils.c
+++ b/src/nftutils.c
@@ -5,7 +5,6 @@
#include "nftutils.h"
#include <netdb.h>
-#include <string.h>
/* Buffer size used for getprotobynumber_r() and similar. The manual comments
* that a buffer of 1024 should be sufficient "for most applications"(??), so
diff --git a/src/optimize.c b/src/optimize.c
index 9c170483..27e0ffe1 100644
--- a/src/optimize.c
+++ b/src/optimize.c
@@ -13,7 +13,6 @@
#include <nft.h>
-#include <string.h>
#include <errno.h>
#include <inttypes.h>
#include <nftables.h>
diff --git a/src/osf.c b/src/osf.c
index 6f5ed9bc..a8f80b2b 100644
--- a/src/osf.c
+++ b/src/osf.c
@@ -11,7 +11,6 @@
#include <nftables.h>
#include <expression.h>
#include <utils.h>
-#include <string.h>
#include <osf.h>
#include <json.h>
diff --git a/src/parser_json.c b/src/parser_json.c
index f03037af..199241a9 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -9,7 +9,6 @@
#include <nft.h>
#include <errno.h>
-#include <string.h>
#include <syslog.h>
#include <erec.h>
diff --git a/src/payload.c b/src/payload.c
index cb8edfac..89bb38eb 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -14,7 +14,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <net/if_arp.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
diff --git a/src/proto.c b/src/proto.c
index 735e37f8..dd84f7c1 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -12,7 +12,6 @@
#include <nft.h>
#include <stddef.h>
-#include <string.h>
#include <net/if_arp.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
diff --git a/src/rt.c b/src/rt.c
index 9ddcb210..f5c80559 100644
--- a/src/rt.c
+++ b/src/rt.c
@@ -13,7 +13,6 @@
#include <errno.h>
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
diff --git a/src/rule.c b/src/rule.c
index faa12afb..52c0672d 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -12,7 +12,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <inttypes.h>
#include <errno.h>
diff --git a/src/sctp_chunk.c b/src/sctp_chunk.c
index 1cd5e20a..24a07e20 100644
--- a/src/sctp_chunk.c
+++ b/src/sctp_chunk.c
@@ -11,7 +11,6 @@
#include <exthdr.h>
#include <sctp_chunk.h>
-#include <string.h>
#define PHT(__token, __offset, __len) \
PROTO_HDR_TEMPLATE(__token, &integer_type, BYTEORDER_BIG_ENDIAN, \
diff --git a/src/segtree.c b/src/segtree.c
index 0a12a0cd..28172b30 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -10,7 +10,6 @@
#include <nft.h>
-#include <string.h>
#include <inttypes.h>
#include <arpa/inet.h>
diff --git a/src/statement.c b/src/statement.c
index a9fefc36..47561166 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdio.h>
#include <inttypes.h>
-#include <string.h>
#include <syslog.h>
#include <rule.h>
diff --git a/src/tcpopt.c b/src/tcpopt.c
index 8a52d872..3fcb2731 100644
--- a/src/tcpopt.c
+++ b/src/tcpopt.c
@@ -2,7 +2,6 @@
#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
#include <netinet/tcp.h>
diff --git a/src/utils.c b/src/utils.c
index caedebda..e6ad8b8b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -14,7 +14,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
-#include <string.h>
#include <nftables.h>
#include <utils.h>
diff --git a/src/xfrm.c b/src/xfrm.c
index 041c0ce7..b32b2a1d 100644
--- a/src/xfrm.c
+++ b/src/xfrm.c
@@ -17,7 +17,6 @@
#include <datatype.h>
#include <gmputil.h>
#include <utils.h>
-#include <string.h>
#include <netinet/ip.h>
#include <linux/netfilter.h>
diff --git a/src/xt.c b/src/xt.c
index bb87e86e..3cb5f028 100644
--- a/src/xt.c
+++ b/src/xt.c
@@ -10,7 +10,6 @@
#include <nft.h>
#include <time.h>
-#include <string.h>
#include <net/if.h>
#include <getopt.h>
#include <ctype.h> /* for isspace */