summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-09-08 19:32:20 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2023-09-11 23:41:38 +0200
commit5b7d1fc6a9ad494801d481615a5af73f82753ac1 (patch)
tree60a3ad833bb8d9973b91bb229e6ec05a94aaecd5
parent702f9905b616a8400eae1ae3ad88029e733a91b8 (diff)
include: include <stdlib.h> in <nft.h>
It provides malloc()/free(), which is so basic that we need it everywhere. Include via <nft.h>. The ultimate purpose is to define more things in <nft.h>. While it has not corresponding C sources, <nft.h> can contain macros and static inline functions, and is a good place for things that we shall have everywhere. Since <stdlib.h> provides malloc()/free() and size_t, that is a very basic dependency, that will be needed for that. Signed-off-by: Thomas Haller <thaller@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/nft.h1
-rw-r--r--include/utils.h1
-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/gmputil.c1
-rw-r--r--src/iface.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/nfnl_osf.c1
-rw-r--r--src/owner.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/segtree.c1
-rw-r--r--src/statement.c1
-rw-r--r--src/tcpopt.c1
-rw-r--r--src/utils.c1
-rw-r--r--src/xt.c1
32 files changed, 1 insertions, 31 deletions
diff --git a/include/nft.h b/include/nft.h
index 967eb7bc..9384054c 100644
--- a/include/nft.h
+++ b/include/nft.h
@@ -6,5 +6,6 @@
#include <stdbool.h>
#include <stdint.h>
+#include <stdlib.h>
#endif /* NFTABLES_NFT_H */
diff --git a/include/utils.h b/include/utils.h
index 5b8b181c..36a28f89 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -3,7 +3,6 @@
#include <asm/byteorder.h>
#include <stdarg.h>
-#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <assert.h>
diff --git a/src/cli.c b/src/cli.c
index bfae90e6..e6971c10 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -14,7 +14,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
diff --git a/src/cmd.c b/src/cmd.c
index 98859674..5e90fdcb 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -15,7 +15,6 @@
#include <utils.h>
#include <iface.h>
#include <errno.h>
-#include <stdlib.h>
#include <cache.h>
#include <string.h>
diff --git a/src/ct.c b/src/ct.c
index ca35087a..6760b085 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -13,7 +13,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git a/src/datatype.c b/src/datatype.c
index 1531a5d2..678a16b1 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -10,7 +10,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <ctype.h> /* isdigit */
diff --git a/src/erec.c b/src/erec.c
index d26dee60..8cadaa80 100644
--- a/src/erec.c
+++ b/src/erec.c
@@ -13,7 +13,6 @@
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
-#include <stdlib.h>
#include <netlink.h>
#include <gmputil.h>
diff --git a/src/evaluate.c b/src/evaluate.c
index 922ce421..b0c6919f 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/expression.c b/src/expression.c
index 147320f0..cb222a2b 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <limits.h>
diff --git a/src/exthdr.c b/src/exthdr.c
index 8aba7da1..545370bd 100644
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -13,7 +13,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <netinet/in.h>
diff --git a/src/gmputil.c b/src/gmputil.c
index 9cda1853..7f65630d 100644
--- a/src/gmputil.c
+++ b/src/gmputil.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/iface.c b/src/iface.c
index ec7f5c7f..e61ea2db 100644
--- a/src/iface.c
+++ b/src/iface.c
@@ -9,7 +9,6 @@
#include <nft.h>
#include <stdio.h>
-#include <stdlib.h>
#include <net/if.h>
#include <time.h>
#include <string.h>
diff --git a/src/libnftables.c b/src/libnftables.c
index 9c802ec9..c5f57294 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -16,7 +16,6 @@
#include <iface.h>
#include <cmd.h>
#include <errno.h>
-#include <stdlib.h>
#include <string.h>
static int nft_netlink(struct nft_ctx *nft,
diff --git a/src/main.c b/src/main.c
index 260338d3..d7961894 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,7 +10,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <stddef.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/src/meta.c b/src/meta.c
index ea00f239..d8fc5f58 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -15,7 +15,6 @@
#include <errno.h>
#include <limits.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <net/if.h>
diff --git a/src/mini-gmp.c b/src/mini-gmp.c
index 6217f745..5d54df08 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 <stdlib.h>
#include <string.h>
#include "mini-gmp.h"
diff --git a/src/misspell.c b/src/misspell.c
index 18da4386..b48ab9cd 100644
--- a/src/misspell.c
+++ b/src/misspell.c
@@ -8,7 +8,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <utils.h>
diff --git a/src/mnl.c b/src/mnl.c
index d583177d..67bb44a6 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -35,7 +35,6 @@
#include <arpa/inet.h>
#include <fcntl.h>
#include <errno.h>
-#include <stdlib.h>
#include <utils.h>
#include <nftables.h>
#include <linux/netfilter.h>
diff --git a/src/monitor.c b/src/monitor.c
index 0554089b..e6f4e15f 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -14,7 +14,6 @@
#include <libmnl/libmnl.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <stdlib.h>
#include <inttypes.h>
#include <libnftnl/table.h>
diff --git a/src/netlink.c b/src/netlink.c
index af6fd427..59cde9a4 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -16,7 +16,6 @@
#include <libmnl/libmnl.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <stdlib.h>
#include <inttypes.h>
#include <libnftnl/table.h>
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index bde783bd..19c3f0bd 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -11,7 +11,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <linux/netfilter/nf_tables.h>
diff --git a/src/nfnl_osf.c b/src/nfnl_osf.c
index 48e83ea8..38a27a36 100644
--- a/src/nfnl_osf.c
+++ b/src/nfnl_osf.c
@@ -25,7 +25,6 @@
#include <ctype.h>
#include <errno.h>
-#include <stdlib.h>
#include <string.h>
#include <time.h>
diff --git a/src/owner.c b/src/owner.c
index be1756a6..65eaad3e 100644
--- a/src/owner.c
+++ b/src/owner.c
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <unistd.h>
-#include <stdlib.h>
#include <sys/time.h>
#include <time.h>
#include <inttypes.h>
diff --git a/src/payload.c b/src/payload.c
index 179ddcbd..dcd87485 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -13,7 +13,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <net/if_arp.h>
diff --git a/src/proto.c b/src/proto.c
index d3bcb0c4..b5cb0106 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -12,7 +12,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <string.h>
#include <net/if_arp.h>
#include <arpa/inet.h>
diff --git a/src/rt.c b/src/rt.c
index c8d75b36..9ddcb210 100644
--- a/src/rt.c
+++ b/src/rt.c
@@ -12,7 +12,6 @@
#include <errno.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/rule.c b/src/rule.c
index bce728ab..1e9e6c1a 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
diff --git a/src/segtree.c b/src/segtree.c
index bf207402..0a12a0cd 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -10,7 +10,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <arpa/inet.h>
diff --git a/src/statement.c b/src/statement.c
index 7b8e68f1..72173949 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
#include <string.h>
diff --git a/src/tcpopt.c b/src/tcpopt.c
index 7b95a011..8a52d872 100644
--- a/src/tcpopt.c
+++ b/src/tcpopt.c
@@ -1,7 +1,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <netinet/in.h>
diff --git a/src/utils.c b/src/utils.c
index d2841f34..caedebda 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -11,7 +11,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/xt.c b/src/xt.c
index a217cc7b..d774e073 100644
--- a/src/xt.c
+++ b/src/xt.c
@@ -9,7 +9,6 @@
#include <nft.h>
-#include <stdlib.h>
#include <time.h>
#include <string.h>
#include <net/if.h>