From: Thomas Haller <thaller@redhat.com>
To: NetFilter <netfilter-devel@vger.kernel.org>
Cc: Thomas Haller <thaller@redhat.com>
Subject: [PATCH nft v2 5/6] include: include <std{bool,int}.h> via <nft.h>
Date: Fri, 25 Aug 2023 13:36:33 +0200 [thread overview]
Message-ID: <20230825113810.2620133-6-thaller@redhat.com> (raw)
In-Reply-To: <20230825113810.2620133-1-thaller@redhat.com>
There is a minimum base that all our sources will end up needing. This
is what <nft.h> provides.
Add <stdbool.h> and <stdint.h> there. It's unlikely that we want to
implement anything, without having "bool" and "uint32_t" types
available.
Yes, this means the internal headers are not self-contained, with
respect to what <nft.h> provides. This is the exception to the rule, and
our internal headers should rely to have <nft.h> included for them.
They should not include <nft.h> themselves, because <nft.h> needs always
be included as first. So when an internal header would include <nft.h>
it would be unnecessary, because the header is *always* included
already.
Signed-off-by: Thomas Haller <thaller@redhat.com>
---
include/datatype.h | 1 -
include/dccpopt.h | 1 -
include/expression.h | 1 -
include/nft.h | 3 +++
include/nftables.h | 1 -
include/rule.h | 1 -
include/utils.h | 2 --
src/dccpopt.c | 1 -
src/evaluate.c | 1 -
src/expression.c | 1 -
src/exthdr.c | 1 -
src/ipopt.c | 1 -
src/mergesort.c | 1 -
src/meta.c | 1 -
src/netlink_delinearize.c | 1 -
src/nftutils.c | 1 -
src/nftutils.h | 1 -
src/parser_json.c | 1 -
src/payload.c | 1 -
src/proto.c | 1 -
src/rt.c | 1 -
src/rule.c | 1 -
src/statement.c | 1 -
src/tcpopt.c | 1 -
24 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/include/datatype.h b/include/datatype.h
index be5c6d1b4011..9ce7359cd340 100644
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -1,7 +1,6 @@
#ifndef NFTABLES_DATATYPE_H
#define NFTABLES_DATATYPE_H
-#include <stdbool.h>
#include <json.h>
/**
diff --git a/include/dccpopt.h b/include/dccpopt.h
index 9686932d74b7..3617fc1ae766 100644
--- a/include/dccpopt.h
+++ b/include/dccpopt.h
@@ -2,7 +2,6 @@
#define NFTABLES_DCCPOPT_H
#include <nftables.h>
-#include <stdint.h>
#define DCCPOPT_TYPE_MIN 0
#define DCCPOPT_TYPE_MAX UINT8_MAX
diff --git a/include/expression.h b/include/expression.h
index 1f58a68c329f..733dd3cfc89c 100644
--- a/include/expression.h
+++ b/include/expression.h
@@ -1,7 +1,6 @@
#ifndef NFTABLES_EXPRESSION_H
#define NFTABLES_EXPRESSION_H
-#include <stdbool.h>
#include <gmputil.h>
#include <linux/netfilter/nf_tables.h>
diff --git a/include/nft.h b/include/nft.h
index 0fd481c6ef04..967eb7bcea09 100644
--- a/include/nft.h
+++ b/include/nft.h
@@ -4,4 +4,7 @@
#include <config.h>
+#include <stdbool.h>
+#include <stdint.h>
+
#endif /* NFTABLES_NFT_H */
diff --git a/include/nftables.h b/include/nftables.h
index f073fa95a60d..219a10100206 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -1,7 +1,6 @@
#ifndef NFTABLES_NFTABLES_H
#define NFTABLES_NFTABLES_H
-#include <stdbool.h>
#include <stdarg.h>
#include <limits.h>
#include <utils.h>
diff --git a/include/rule.h b/include/rule.h
index 13ab1bf3df5a..8e876d0a42ed 100644
--- a/include/rule.h
+++ b/include/rule.h
@@ -1,7 +1,6 @@
#ifndef NFTABLES_RULE_H
#define NFTABLES_RULE_H
-#include <stdint.h>
#include <nftables.h>
#include <list.h>
#include <netinet/in.h>
diff --git a/include/utils.h b/include/utils.h
index 6764f9219ada..cee1e5c1e8ae 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -2,8 +2,6 @@
#define NFTABLES_UTILS_H
#include <asm/byteorder.h>
-#include <stdint.h>
-#include <stdbool.h>
#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/dccpopt.c b/src/dccpopt.c
index d713d9034c92..ebb645a98c5a 100644
--- a/src/dccpopt.c
+++ b/src/dccpopt.c
@@ -1,7 +1,6 @@
#include <nft.h>
#include <stddef.h>
-#include <stdint.h>
#include <datatype.h>
#include <dccpopt.h>
diff --git a/src/evaluate.c b/src/evaluate.c
index 69a123511be8..1ae2ef0de10c 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
diff --git a/src/expression.c b/src/expression.c
index 8ef008910da5..147320f08937 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <limits.h>
diff --git a/src/exthdr.c b/src/exthdr.c
index dd8c75815314..8aba7da1fa69 100644
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -15,7 +15,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
diff --git a/src/ipopt.c b/src/ipopt.c
index 3ba67b011166..37f779d468ab 100644
--- a/src/ipopt.c
+++ b/src/ipopt.c
@@ -1,6 +1,5 @@
#include <nft.h>
-#include <stdint.h>
#include <netinet/in.h>
#include <netinet/ip.h>
diff --git a/src/mergesort.c b/src/mergesort.c
index 9315093b3359..5965236af6b7 100644
--- a/src/mergesort.c
+++ b/src/mergesort.c
@@ -8,7 +8,6 @@
#include <nft.h>
-#include <stdint.h>
#include <expression.h>
#include <gmputil.h>
#include <list.h>
diff --git a/src/meta.c b/src/meta.c
index fcb872e669df..4f383269d032 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,7 +17,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index dfa816cfdfb6..1121f730ffa7 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -12,7 +12,6 @@
#include <nft.h>
#include <stdlib.h>
-#include <stdbool.h>
#include <string.h>
#include <limits.h>
#include <linux/netfilter/nf_tables.h>
diff --git a/src/nftutils.c b/src/nftutils.c
index 14cb1fcf07de..9c7fe5edc022 100644
--- a/src/nftutils.c
+++ b/src/nftutils.c
@@ -6,7 +6,6 @@
#include <netdb.h>
#include <string.h>
-#include <stdint.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/nftutils.h b/src/nftutils.h
index cb584b9ca32b..7db56f428980 100644
--- a/src/nftutils.h
+++ b/src/nftutils.h
@@ -2,7 +2,6 @@
#ifndef NFTUTILS_H
#define NFTUTILS_H
-#include <stdbool.h>
#include <stddef.h>
/* The maximum buffer size for (struct protoent).p_name. It is excessively large,
diff --git a/src/parser_json.c b/src/parser_json.c
index 323d15bb5b71..4ea5b4326a90 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -9,7 +9,6 @@
#include <nft.h>
#include <errno.h>
-#include <stdint.h> /* needed by gmputil.h */
#include <string.h>
#include <syslog.h>
diff --git a/src/payload.c b/src/payload.c
index 9fdbf4997c4e..0afffb2338ef 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,7 +15,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <net/if_arp.h>
#include <arpa/inet.h>
diff --git a/src/proto.c b/src/proto.c
index eb9c3ea18e68..4650e58cd6ed 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdlib.h>
-#include <stdint.h>
#include <string.h>
#include <net/if_arp.h>
#include <arpa/inet.h>
diff --git a/src/rt.c b/src/rt.c
index 33820d4c8719..c8d75b369f8b 100644
--- a/src/rt.c
+++ b/src/rt.c
@@ -14,7 +14,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <arpa/inet.h>
#include <linux/netfilter.h>
diff --git a/src/rule.c b/src/rule.c
index f2c4768e01ab..8ea606e146b2 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <inttypes.h>
#include <errno.h>
diff --git a/src/statement.c b/src/statement.c
index e6ea43d0a4d1..7b8e68f19117 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -13,7 +13,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <inttypes.h>
#include <string.h>
#include <syslog.h>
diff --git a/src/tcpopt.c b/src/tcpopt.c
index 5dd760a51aab..7b95a0113403 100644
--- a/src/tcpopt.c
+++ b/src/tcpopt.c
@@ -3,7 +3,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
--
2.41.0
next prev parent reply other threads:[~2023-08-25 11:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-25 11:36 [PATCH nft v2 0/6] cleanup base includes and add <nft.h> header Thomas Haller
2023-08-25 11:36 ` [PATCH nft v2 1/6] meta: define _GNU_SOURCE to get strptime() from <time.h> Thomas Haller
2023-08-25 11:36 ` [PATCH nft v2 2/6] src: add <nft.h> header and include it as first Thomas Haller
2023-08-25 11:36 ` [PATCH nft v2 3/6] include: don't define _GNU_SOURCE in public header Thomas Haller
2023-08-25 11:36 ` [PATCH nft v2 4/6] configure: use AC_USE_SYSTEM_EXTENSIONS to get _GNU_SOURCE Thomas Haller
2023-08-25 11:36 ` Thomas Haller [this message]
2023-08-25 11:36 ` [PATCH nft v2 6/6] configure: drop AM_PROG_CC_C_O autoconf check Thomas Haller
2023-08-25 13:01 ` [PATCH nft v2 0/6] cleanup base includes and add <nft.h> header Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230825113810.2620133-6-thaller@redhat.com \
--to=thaller@redhat.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).