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>

diff --git a/include/nft.h b/include/nft.h
index 967eb7bcea0965ee8c233b6662d8aea1fbe8b0a6..9384054c11c86b15d9f7f6f2fbb750175ea7eb77 100644 (file)
--- 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 5b8b181c1e99c9c02067efcccd888e28dbb90726..36a28f89366776bded054fa7150e0be8539c8990 100644 (file)
--- 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 bfae90e67554dfc95fca357f1aec9b87ace94fca..e6971c109cb1fd3954f20243f5c4d7981c95f13a 100644 (file)
--- 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 98859674d24b933471a0be7201536ec27bb87dd5..5e90fdcbd99a5c16dc3110bd1305958819e5559c 100644 (file)
--- 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 ca35087ad7b7583f0de51025abc726413ad31a15..6760b08570dea28b85ae4453494f1a9b16aead03 100644 (file)
--- 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 1531a5d2a601c9cab25a00d332184ae3c51ff2c7..678a16b1f3af9e74e5584c1be7c6a2bb0c42c3ac 100644 (file)
--- 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 d26dee602e8a4c6809419624fdebacc3f53780e5..8cadaa8069d154fbf1a008c221d96a563929ea06 100644 (file)
--- 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 922ce42114a5dfc851376deb1f99eaaa561dbe2c..b0c6919f600a574969cfbf3c4a753f1328f1baf9 100644 (file)
--- 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 147320f08937e1ac38df6a64cfda391de0c9d9b8..cb222a2b08b93a2a6aa7234eadf7f0bec82c478e 100644 (file)
--- 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 8aba7da1fa69603ef65108c35213586aee4fcb98..545370bd57a644580eb448d51c1983caaabee1ac 100644 (file)
--- 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 9cda18534d0add982bf22e0d24ea6173c5925336..7f65630db59c56c6ba433ff515c9e2d9421d35f7 100644 (file)
--- 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 ec7f5c7f4cd9579c68319767ea3a5b9b21c18140..e61ea2db1f4cee41a13e8a4f7f853b98ba90a658 100644 (file)
--- 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 9c802ec95f27adad5de2bad7b3dd8b16c7f308f7..c5f5729409d1aa737db7414b021f82fe34965e3f 100644 (file)
--- 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 260338d320ab2ee1976f73543256fcdff9acd341..d796189435d85e78c9b8c146542c653b3bcff7fd 100644 (file)
--- 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 ea00f2396b994f1a0b2442d7b3342fcf5b4ed961..d8fc5f585e7437588e01670fd825645d0d2f35c9 100644 (file)
--- 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 6217f745465172431f9ffdd93d5713411be1b980..5d54df08eaa8687f019e1c6537a316262033aa6d 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 <stdlib.h>
 #include <string.h>
 
 #include "mini-gmp.h"

diff --git a/src/misspell.c b/src/misspell.c
index 18da4386ea5b62e5189cde9113b6d747618587d5..b48ab9cd334251da9657e5b0c6c621e9478223e3 100644 (file)
--- 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 d583177d5490a1219c99f81a8357cece905fd431..67bb44a6eb0dcf5c60e7e2d51a2957d946928ec2 100644 (file)
--- 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 0554089b74ac64d48fd882fc26834c1711a835e6..e6f4e15faec8fa9538ec9a63d393a69e3ca378a9 100644 (file)
--- 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 af6fd427bd571ec290a15ee928bfd7cbcf710535..59cde9a483138e37d223631572e17e6c3a768c4b 100644 (file)
--- 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 bde783bdf4adcc27a02877bbf34d962480870ebc..19c3f0bd0b268a074e5b08a5831ae70ae12877f2 100644 (file)
--- 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 48e83ea8a5497bc4aa83c32bd25b2d3cbaf76b25..38a27a3683e2ee931b3b24cf8983c8fb8be5deeb 100644 (file)
--- 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 be1756a68c75ad83fecd1289989ff3c945680c4b..65eaad3e46d39cc800d0fbdfef788c4ce00e1546 100644 (file)
--- 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 179ddcbdd3fe8e4122c0cbcf9edcaf9b5b024a44..dcd87485c068090bf2c8c0319d1ea905b0851fc3 100644 (file)
--- 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 d3bcb0c4bd0b10a6c9f91687e8ef342a5428ab95..b5cb0106dd7ba570ae5356eb44c4ffffe1f4a6b9 100644 (file)
--- 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 c8d75b369f8b9c34e77fe5a8a46718aa48bfcdcf..9ddcb210eaad69f712bf1aa61d9264b9c26afa14 100644 (file)
--- 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 bce728ab9b46e67bbbc682ff090b9e0e683acb72..1e9e6c1a92c20e2c135590a83224fc708583050f 100644 (file)
--- 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 bf207402c945bb9ac8199b9d4d982a3b44bae62f..0a12a0cd5151a1444a55213d06f49a85e1388fba 100644 (file)
--- 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 7b8e68f191179ffd70252e2281823c4b54f910e8..721739498e2eea16aaaee13241bb4bb946d6cb5f 100644 (file)
--- 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 7b95a01134030e9d420b3774f7bded94e6ce64f7..8a52d872209105e82504be02cd60075f664aa146 100644 (file)
--- 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 d2841f3469b593ab19419ccc2d72f407f8a92b53..caedebda183b49bd75e088b856b5d93860e9e27a 100644 (file)
--- 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 a217cc7b6bd0c04d3fecaa57cde50146bf44a85f..d774e07395a6886bf55f073999a65cded5809575 100644 (file)
--- 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>