Fix use of reserved names in header sandwich

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/ct.h b/include/ct.h
index 946bc297c6fa86cf01a76c16d0b8d9c02fb1c1ce..67718c849d93f942493271481dbad8c5b9650957 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -1,5 +1,5 @@
-#ifndef _CT_H
-#define _CT_H
+#ifndef NFTABLES_CT_H
+#define NFTABLES_CT_H
 
 /**
  * struct ct_template
@@ -26,4 +26,4 @@ struct ct_template {
 extern struct expr *ct_expr_alloc(const struct location *loc,
                                  enum nft_ct_keys key);
 
-#endif /* _CT_H */
+#endif /* NFTABLES_CT_H */

diff --git a/include/datatype.h b/include/datatype.h
index c6aeeedae30aba1bfbf1f7da57372510a1aee956..c341522303432a49e59ff359fc738f929a821fe6 100644 (file)
--- a/include/datatype.h
+++ b/include/datatype.h
@@ -1,5 +1,5 @@
-#ifndef _DATATYPE_H
-#define _DATATYPE_H
+#ifndef NFTABLES_DATATYPE_H
+#define NFTABLES_DATATYPE_H
 
 /**
  * enum datatypes
@@ -153,4 +153,4 @@ extern const struct datatype inet_service_type;
 extern const struct datatype mark_type;
 extern const struct datatype time_type;
 
-#endif /* _DATATYPE_H */
+#endif /* NFTABLES_DATATYPE_H */

diff --git a/include/erec.h b/include/erec.h
index 51f395880d13609204bfa0a1a2080c777fa25e6e..25df1d0fad8e8d84363ab0162f0536adeb7c6847 100644 (file)
--- a/include/erec.h
+++ b/include/erec.h
@@ -1,5 +1,5 @@
-#ifndef _EREC_H
-#define _EREC_H
+#ifndef NFTABLES_EREC_H
+#define NFTABLES_EREC_H
 
 #include <nftables.h>
 #include <utils.h>
@@ -61,4 +61,4 @@ static inline void erec_queue(struct error_record *erec,
 extern void erec_print(FILE *f, const struct error_record *erec);
 extern void erec_print_list(FILE *f, struct list_head *list);
 
-#endif /* _EREC_H */
+#endif /* NFTABLES_EREC_H */

diff --git a/include/expression.h b/include/expression.h
index 725854691ce1952dcf163a9f06254dc133bb8284..e9d21cfc7f755d64be1e1fe9c2957254722e6b9a 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -1,5 +1,5 @@
-#ifndef _EXPRESSION_H
-#define _EXPRESSION_H
+#ifndef NFTABLES_EXPRESSION_H
+#define NFTABLES_EXPRESSION_H
 
 #include <stdbool.h>
 #include <gmp.h>
@@ -320,4 +320,4 @@ extern struct expr *mapping_expr_alloc(const struct location *loc,
 extern struct expr *map_expr_alloc(const struct location *loc,
                                   struct expr *arg, struct expr *list);
 
-#endif /* _EXPRESSION_H */
+#endif /* NFTABLES_EXPRESSION_H */

diff --git a/include/exthdr.h b/include/exthdr.h
index 8ef0b395c9d0fb425942bd596d7f50a738de7567..62e69bd20bf7d05748c414641de78748ef32e882 100644 (file)
--- a/include/exthdr.h
+++ b/include/exthdr.h
@@ -1,5 +1,5 @@
-#ifndef _EXTHDR_H
-#define _EXTHDR_H
+#ifndef NFTABLES_EXTHDR_H
+#define NFTABLES_EXTHDR_H
 
 /**
  * struct exthdr_desc - extension header description
@@ -81,4 +81,4 @@ extern const struct exthdr_desc exthdr_frag;
 extern const struct exthdr_desc exthdr_dst;
 extern const struct exthdr_desc exthdr_mh;
 
-#endif /* _EXTHDR_H */
+#endif /* NFTABLES_EXTHDR_H */

diff --git a/include/gmputil.h b/include/gmputil.h
index 41a6c2700fdbf622552f67d97c7c42a363af8014..88be697aaece004cd13d9e95296e3ffd7554df17 100644 (file)
--- a/include/gmputil.h
+++ b/include/gmputil.h
@@ -1,5 +1,5 @@
-#ifndef _GMPUTIL_H
-#define _GMPUTIL_H
+#ifndef NFTABLES_GMPUTIL_H
+#define NFTABLES_GMPUTIL_H
 
 #include <gmp.h>
 
@@ -39,4 +39,4 @@ extern void mpz_import_data(mpz_t rop, const void *data,
                            unsigned int len);
 extern void mpz_switch_byteorder(mpz_t rop, unsigned int len);
 
-#endif /* _GMPUTIL_H */
+#endif /* NFTABLES_GMPUTIL_H */

diff --git a/include/headers.h b/include/headers.h
index be20cec02b6b114f03ede98283bd5b154f7efa1d..5bbfdc49975aea30bab1d5e7ac6dfeecc8990345 100644 (file)
--- a/include/headers.h
+++ b/include/headers.h
@@ -1,5 +1,5 @@
-#ifndef _HEADERS_H
-#define _HEADERS_H
+#ifndef NFTABLES_HEADERS_H
+#define NFTABLES_HEADERS_H
 
 #ifndef IPPROTO_UDPLITE
 # define IPPROTO_UDPLITE       136
@@ -116,4 +116,4 @@ struct ip6_mh {
 /* RFC 5142 */
 #define IP6_MH_TYPE_HASM       12      /* Home Agent Switch Message    */
 
-#endif /* _HEADERS_H */
+#endif /* NFTABLES_HEADERS_H */

diff --git a/include/meta.h b/include/meta.h
index 75b1f1eb34969e49def046b5ea146b1fafd631ba..459221fb344aae3e58e0736145b2dba2baec2b60 100644 (file)
--- a/include/meta.h
+++ b/include/meta.h
@@ -1,5 +1,5 @@
-#ifndef _META_H
-#define _META_H
+#ifndef NFTABLES_META_H
+#define NFTABLES_META_H
 
 /**
  * struct meta_template - template for meta expressions and statements
@@ -26,4 +26,4 @@ struct meta_template {
 extern struct expr *meta_expr_alloc(const struct location *loc,
                                    enum nft_meta_keys key);
 
-#endif /* _META_H */
+#endif /* NFTABLES_META_H */

diff --git a/include/netlink.h b/include/netlink.h
index 4849ff515a3934511d14719089e239d77f819653..cec5247b74526f19c8c2448aace679ede751f1fc 100644 (file)
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -1,5 +1,5 @@
-#ifndef _NETLINK_H
-#define _NETLINK_H
+#ifndef NFTABLES_NETLINK_H
+#define NFTABLES_NETLINK_H
 
 #include <netlink/netfilter/netfilter.h>
 #include <netlink/netfilter/nft_table.h>
@@ -57,4 +57,4 @@ extern int netlink_get_table(struct netlink_ctx *ctx, const struct handle *h);
 extern int netlink_list_table(struct netlink_ctx *ctx, const struct handle *h);
 extern int netlink_flush_table(struct netlink_ctx *ctx, const struct handle *h);
 
-#endif /* _NETLINK_H */
+#endif /* NFTABLES_NETLINK_H */

diff --git a/include/nftables.h b/include/nftables.h
index 7e4a2fc8786c6b3658467c2f42c72f811fc66d93..d0a3d54472f22ed58d3c63d58efbc903335be3d5 100644 (file)
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -1,5 +1,5 @@
-#ifndef _NFTABLES_H
-#define _NFTABLES_H
+#ifndef NFTABLES_NFTABLES_H
+#define NFTABLES_NFTABLES_H
 
 #include <stdbool.h>
 #include <stdarg.h>
@@ -93,4 +93,4 @@ struct input_descriptor {
        off_t                           line_offset;
 };
 
-#endif /* _NFTABLES_H */
+#endif /* NFTABLES_NFTABLES_H */

diff --git a/include/parser.h b/include/parser.h
index 2a4c73b4f74e0c6a7b5f6400f1c35c2cf22185b0..a47bd0f078327abe76a0a41d7e0de50be7553d15 100644 (file)
--- a/include/parser.h
+++ b/include/parser.h
@@ -1,5 +1,5 @@
-#ifndef _PARSER_H
-#define _PARSER_H
+#ifndef NFTABLES_PARSER_H
+#define NFTABLES_PARSER_H
 
 #include <list.h>
 
@@ -33,4 +33,4 @@ extern void scanner_push_buffer(void *scanner,
                                const struct input_descriptor *indesc,
                                const char *buffer);
 
-#endif /* _PARSER_H */
+#endif /* NFTABLES_PARSER_H */

diff --git a/include/payload.h b/include/payload.h
index ff9b1381b8064ede8f61af60466ee1ff0b2be94a..3a7150bd5d66b70e1dbb93b477f6808a2084e59f 100644 (file)
--- a/include/payload.h
+++ b/include/payload.h
@@ -1,5 +1,5 @@
-#ifndef _PAYLOAD_H
-#define _PAYLOAD_H
+#ifndef NFTABLES_PAYLOAD_H
+#define NFTABLES_PAYLOAD_H
 
 #include <nftables.h>
 
@@ -286,4 +286,4 @@ extern const struct payload_desc payload_arp;
 extern const struct payload_desc payload_vlan;
 extern const struct payload_desc payload_eth;
 
-#endif /* _PAYLOAD_H */
+#endif /* NFTABLES_PAYLOAD_H */

diff --git a/include/rbtree.h b/include/rbtree.h
index 26b6b44aa71845abf410f97cd6724f5a572c7bcb..ac65283fee5b80bbe8bca8581d8eba006f4a2f9b 100644 (file)
--- a/include/rbtree.h
+++ b/include/rbtree.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef        _RBTREE_H
-#define        _RBTREE_H
+#ifndef        NFTABLES_RBTREE_H
+#define        NFTABLES_RBTREE_H
 
 #include <stddef.h>
 
@@ -95,4 +95,4 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
             (pos) != NULL; \
             (node) = (next))
 
-#endif /* _RBTREE_H */
+#endif /* NFTABLES_RBTREE_H */

diff --git a/include/rule.h b/include/rule.h
index e4ad9f58725680cb86fb605532e725e523e87862..991d1125284cb28d70627ce2d524c515440d9acb 100644 (file)
--- a/include/rule.h
+++ b/include/rule.h
@@ -1,5 +1,5 @@
-#ifndef _RULE_H
-#define _RULE_H
+#ifndef NFTABLES_RULE_H
+#define NFTABLES_RULE_H
 
 #include <stdint.h>
 #include <nftables.h>
@@ -171,4 +171,4 @@ extern struct error_record *rule_postprocess(struct rule *rule);
 struct netlink_ctx;
 extern int do_command(struct netlink_ctx *ctx, struct cmd *cmd);
 
-#endif /* RULE_H */
+#endif /* NFTABLES_RULE_H */

diff --git a/include/statement.h b/include/statement.h
index 6e5cfbdb335668fdc4a54e6e4dd15e07a4b56d29..20b6f9a90571432ee8d2347a7fb4d54e2fd4c18b 100644 (file)
--- a/include/statement.h
+++ b/include/statement.h
@@ -1,5 +1,5 @@
-#ifndef _STATEMENT_H
-#define _STATEMENT_H
+#ifndef NFTABLES_STATEMENT_H
+#define NFTABLES_STATEMENT_H
 
 #include <list.h>
 #include <expression.h>
@@ -137,4 +137,4 @@ extern void stmt_free(struct stmt *stmt);
 extern void stmt_list_free(struct list_head *list);
 extern void stmt_print(const struct stmt *stmt);
 
-#endif /* _STATEMENT_H */
+#endif /* NFTABLES_STATEMENT_H */

diff --git a/include/utils.h b/include/utils.h
index beb638686402027e3266eba03e83f228ba9ac9c9..15271e5b6d1fe70d918946befedbdc66e3c0025f 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -1,5 +1,5 @@
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef NFTABLES_UTILS_H
+#define NFTABLES_UTILS_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -66,4 +66,4 @@ extern void *xrealloc(void *ptr, size_t size);
 extern void *xzalloc(size_t size);
 extern char *xstrdup(const char *s);
 
-#endif /* _UTILS_H */
+#endif /* NFTABLES_UTILS_H */