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>

diff --git a/include/cache.h b/include/cache.h
index e66b0af5fe0f637263f2da7e196bcbc522593283..8ca4a9a79c03300459b9c2bf30151e2784b0a9a4 100644 (file)
--- a/include/cache.h
+++ b/include/cache.h
@@ -1,8 +1,6 @@
 #ifndef _NFT_CACHE_H_
 #define _NFT_CACHE_H_
 
-#include <string.h>
-
 #include <list.h>
 
 struct handle;

diff --git a/include/nft.h b/include/nft.h
index 9384054c11c86b15d9f7f6f2fbb750175ea7eb77..3c894e5b67a71b97e4e8a7f58a1db467a3a288bb 100644 (file)
--- a/include/nft.h
+++ b/include/nft.h
@@ -7,5 +7,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #endif /* NFTABLES_NFT_H */

diff --git a/include/rule.h b/include/rule.h
index 5ceb3ae62288d45f53cf4230650533ea46ca9cf5..6236d2927c0a938005dd853ee1a24efc79511db9 100644 (file)
--- a/include/rule.h
+++ b/include/rule.h
@@ -6,7 +6,6 @@
 #include <netinet/in.h>
 #include <libnftnl/object.h>   /* For NFTNL_CTTIMEOUT_ARRAY_MAX. */
 #include <linux/netfilter/nf_tables.h>
-#include <string.h>
 #include <cache.h>
 
 /**

diff --git a/src/cli.c b/src/cli.c
index e6971c109cb1fd3954f20243f5c4d7981c95f13a..448c25c268487993a3fb1a641a3daebae61c90b9 100644 (file)
--- 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 358dd1f9364e4ecb062ec283368483fd9c6e5048..68c476c693675878dbea71bb528ed21583b4824b 100644 (file)
--- 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 b2635543e6ec9bdaa47b61bf73a43297813b3776..1dda799d117e2edbb67e26be5da49cd51a106257 100644 (file)
--- 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 f5d700bd8d21ead4b0cfa57a41e68a31c99bd788..6fe46e899c4bdc322468845cec9c6cdb1afc9b41 100644 (file)
--- 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 8cadaa8069d154fbf1a008c221d96a563929ea06..cd9f62be8ba24af40b1293c5ef82b278cf1a8678 100644 (file)
--- 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 c404e9a83eccce9f0a0b24bd08e4a119e5467729..c699a9bc7b86f7f532e9232af3293d700d971116 100644 (file)
--- 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 c914795041e6fe3a3d3234d624a90f84cb1e6a57..a21dfec25722ab4873be30bf3268631d745c1d4f 100644 (file)
--- 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 545370bd57a644580eb448d51c1983caaabee1ac..60c7cd1e67f6bcf37dc89a6cec3b50f8bc9d970b 100644 (file)
--- 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 b977fe28e8034cba90def89c5fc7cfb5641a781a..e95271c9dcb8c1dfebb85cf78a7b93d08f2d1194 100644 (file)
--- 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 bf472c65de48b251e26c5657d0d33875fb5c88ec..cb26b55810c2a1f94b278ccdd1280e3b391350e2 100644 (file)
--- 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 e61ea2db1f4cee41a13e8a4f7f853b98ba90a658..428acaae2eac33ff3d60f92efde8da57e71c5c34 100644 (file)
--- 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 1be58221c69967c414c0723d482b4aac346c1854..068c423addc77c698d702e73b0f79469c8c233da 100644 (file)
--- 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 1ca5a6f48c4c1b2a12ca94b5d40dcb0ff63b19be..4b4cf5b67ef8b08494b8cfb0bf5b197cda910e6e 100644 (file)
--- 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 d796189435d85e78c9b8c146542c653b3bcff7fd..9485b193cd34dfffa26d487948aa1378d95918d0 100644 (file)
--- 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 181e111cbbdc31883330b6f0aebf8e11018d5fb6..b578d5e24c067a3de344e6703b1433d8c198bfb7 100644 (file)
--- 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 5d54df08eaa8687f019e1c6537a316262033aa6d..186dc3a47a2ccad6be7657901edc7a7ebc8ebf64 100644 (file)
--- 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 b48ab9cd334251da9657e5b0c6c621e9478223e3..c1e58a0e8a8c075bc7925f6ea31a9037f95e062b 100644 (file)
--- 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 67bb44a6eb0dcf5c60e7e2d51a2957d946928ec2..0fb36bd588ee046e7043732580e915c885e363b1 100644 (file)
--- 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 e6f4e15faec8fa9538ec9a63d393a69e3ca378a9..82762a0fe47b7bd6f7178b09f1bf242701a31874 100644 (file)
--- 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 8af579c7b77862c027cf573cec2e312b494dab8a..120a8ba9ceb1e14a2b171db854141f0a4632f048 100644 (file)
--- 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 41cb37a3ccb322b632919ff21cb53b5a719ee878..e21451044451d31cbcc08fa8c10854a9688a925e 100644 (file)
--- 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 c91211582b3d6df9aadcb72e25dca53945b16171..0c62341112d83211e73200548c162b4a3746dde4 100644 (file)
--- 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 38a27a3683e2ee931b3b24cf8983c8fb8be5deeb..20a1bfe7e745e86c1061fc745e4b6d22ee305f6c 100644 (file)
--- 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 9c7fe5edc022e17dd7d1138536b6b6ed9b749e85..ca178aa0fb94dc950a485dab49d4493bf17a7f03 100644 (file)
--- 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 9c17048316936fc4ed0963a7d51bbf12e94e8483..27e0ffe1e124af7fa317d29c7a88d5cffb09061c 100644 (file)
--- 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 6f5ed9bc895a15c587aa9720afef2fddc9a7423d..a8f80b2bbaacb89e285fe3e9c2896e2e959fa4e9 100644 (file)
--- 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 f03037af2548ff826d967086c68f65c90f9d88fe..199241a97cdb1be16b62b640ea64d48874f3dc61 100644 (file)
--- 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 cb8edfac03388de27d20bba7efed879367a10210..89bb38eb00999bc75133054d5efd41291f61e2cb 100644 (file)
--- 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 735e37f850c50d1df478a39c79346beb013faf1b..dd84f7c16380b1a179a61399acf3a2eea926adf8 100644 (file)
--- 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 9ddcb210eaad69f712bf1aa61d9264b9c26afa14..f5c80559ffeef37113e044e17f0575c5916ec1d0 100644 (file)
--- 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 faa12afb3a07e253d30ae780235488294b2c1eb4..52c0672d4cf08be8fe6df4b538d709c4d576df12 100644 (file)
--- 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 1cd5e20abf78e638414f8fa69a0d695b13f196c2..24a07e208dcf2d7204406652997b720c345325a9 100644 (file)
--- 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 0a12a0cd5151a1444a55213d06f49a85e1388fba..28172b30c5b393211e1b9f3e26809f74ee3b5c5e 100644 (file)
--- 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 a9fefc365650bbf84c1580055ff5b23037aadced..475611664946a955b20407bec978bf01187fdca4 100644 (file)
--- 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 8a52d872209105e82504be02cd60075f664aa146..3fcb2731ae73341812375cb5b6950b8249592615 100644 (file)
--- 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 caedebda183b49bd75e088b856b5d93860e9e27a..e6ad8b8b2af9478b1df3993f97b2c207973bc618 100644 (file)
--- 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 041c0ce7ac6d9904edcb3775a0fbf5fc2172ebd9..b32b2a1d760e67fc7d0d54e93019ca21ca4c66a6 100644 (file)
--- 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 bb87e86e02af4f9e83c5827e9ceec46d07950152..3cb5f028b20e39d938827076495aa75682f90617 100644 (file)
--- 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 */