From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 17 Jul 2021 09:24:47 +0000 (+0200)
Subject: extensions: use simpler header guards
X-Git-Tag: v3.19~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f308c7262d7bc161a37e8fe630d380ea03d6a38;p=thirdparty%2Fxtables-addons.git

extensions: use simpler header guards
---

diff --git a/extensions/ACCOUNT/libxt_ACCOUNT_cl.h b/extensions/ACCOUNT/libxt_ACCOUNT_cl.h
index 48a46f3..62178f3 100644
--- a/extensions/ACCOUNT/libxt_ACCOUNT_cl.h
+++ b/extensions/ACCOUNT/libxt_ACCOUNT_cl.h
@@ -7,10 +7,7 @@
  *   version 2.1 as published by the Free Software Foundation;             *
  *                                                                         *
  ***************************************************************************/
-
-#ifndef _xt_ACCOUNT_cl_H
-#define _xt_ACCOUNT_cl_H
-
+#pragma once
 #include <xt_ACCOUNT.h>
 
 #define LIBXT_ACCOUNT_VERSION "1.3"
@@ -55,6 +52,3 @@ const char *ipt_ACCOUNT_get_next_name(struct ipt_ACCOUNT_context *ctx);
 #ifdef __cplusplus
 }
 #endif
-
-
-#endif
diff --git a/extensions/ACCOUNT/xt_ACCOUNT.h b/extensions/ACCOUNT/xt_ACCOUNT.h
index bf4f36d..32a92a8 100644
--- a/extensions/ACCOUNT/xt_ACCOUNT.h
+++ b/extensions/ACCOUNT/xt_ACCOUNT.h
@@ -7,9 +7,7 @@
  *   version 2 as published by the Free Software Foundation;               *
  *                                                                         *
  ***************************************************************************/
-
-#ifndef _IPT_ACCOUNT_H
-#define _IPT_ACCOUNT_H
+#pragma once
 
 /*
  * Socket option interface shared between kernel (xt_ACCOUNT) and userspace
@@ -64,5 +62,3 @@ struct ipt_acc_handle_ip {
 	uint64_t dst_packets;
 	uint64_t dst_bytes;
 };
-
-#endif /* _IPT_ACCOUNT_H */
diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h
index ba064c1..5ab6eae 100644
--- a/extensions/compat_skbuff.h
+++ b/extensions/compat_skbuff.h
@@ -1,6 +1,4 @@
-#ifndef COMPAT_SKBUFF_H
-#define COMPAT_SKBUFF_H 1
-
+#pragma once
 struct tcphdr;
 struct udphdr;
 
@@ -12,5 +10,3 @@ struct udphdr;
 #else
 #	define skb_secmark(skb) 0
 #endif
-
-#endif /* COMPAT_SKBUFF_H */
diff --git a/extensions/compat_user.h b/extensions/compat_user.h
index 3ad168c..ccfa94e 100644
--- a/extensions/compat_user.h
+++ b/extensions/compat_user.h
@@ -1,12 +1,8 @@
 /*
  *	Userspace-level compat hacks
  */
-#ifndef _XTABLES_COMPAT_USER_H
-#define _XTABLES_COMPAT_USER_H 1
-
+#pragma once
 /* linux-glibc-devel 2.6.34 header screwup */
 #ifndef ALIGN
 #	define ALIGN(s, n) (((s) + ((n) - 1)) & ~((n) - 1))
 #endif
-
-#endif /* _XTABLES_COMPAT_USER_H */
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index 2ac8d52..a97dd10 100644
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -1,6 +1,4 @@
-#ifndef _XTABLES_COMPAT_H
-#define _XTABLES_COMPAT_H 1
-
+#pragma once
 #include <linux/kernel.h>
 #include <linux/version.h>
 #include "compat_skbuff.h"
@@ -47,5 +45,3 @@ static inline struct net *par_net(const struct xt_action_param *par)
 #	define proc_lseek llseek
 #	define proc_release release
 #endif
-
-#endif /* _XTABLES_COMPAT_H */
diff --git a/extensions/compat_xtnu.h b/extensions/compat_xtnu.h
index 150dc0e..a2c1e5c 100644
--- a/extensions/compat_xtnu.h
+++ b/extensions/compat_xtnu.h
@@ -1,6 +1,4 @@
-#ifndef _COMPAT_XTNU_H
-#define _COMPAT_XTNU_H 1
-
+#pragma once
 #include <linux/netfilter/x_tables.h>
 
 struct module;
@@ -63,5 +61,3 @@ extern int xtnu_register_targets(struct xtnu_target *, unsigned int);
 extern void xtnu_unregister_targets(struct xtnu_target *, unsigned int);
 
 extern void *HX_memmem(const void *, size_t, const void *, size_t);
-
-#endif /* _COMPAT_XTNU_H */
diff --git a/extensions/pknock/xt_pknock.h b/extensions/pknock/xt_pknock.h
index fb201df..abf6d6a 100644
--- a/extensions/pknock/xt_pknock.h
+++ b/extensions/pknock/xt_pknock.h
@@ -8,9 +8,7 @@
  *
  * This program is released under the terms of GNU GPL version 2.
  */
-#ifndef _XT_PKNOCK_H
-#define _XT_PKNOCK_H
-
+#pragma once
 #define PKNOCK "xt_pknock: "
 
 enum {
@@ -47,5 +45,3 @@ struct xt_pknock_nl_msg {
 	char rule_name[XT_PKNOCK_MAX_BUF_LEN+1];
 	__be32 peer_ip;
 };
-
-#endif /* _XT_PKNOCK_H */
diff --git a/extensions/xt_CHAOS.h b/extensions/xt_CHAOS.h
index d9b74fd..4e15142 100644
--- a/extensions/xt_CHAOS.h
+++ b/extensions/xt_CHAOS.h
@@ -1,6 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_CHAOS_H
-#define _LINUX_NETFILTER_XT_CHAOS_H 1
-
+#pragma once
 enum xt_chaos_target_variant {
 	XTCHAOS_NORMAL,
 	XTCHAOS_TARPIT,
@@ -10,5 +8,3 @@ enum xt_chaos_target_variant {
 struct xt_chaos_tginfo {
 	uint8_t variant;
 };
-
-#endif /* _LINUX_NETFILTER_XT_CHAOS_H */
diff --git a/extensions/xt_DHCPMAC.h b/extensions/xt_DHCPMAC.h
index b5bd93b..3e3c297 100644
--- a/extensions/xt_DHCPMAC.h
+++ b/extensions/xt_DHCPMAC.h
@@ -1,6 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_DHCPMAC_H
-#define _LINUX_NETFILTER_XT_DHCPMAC_H 1
-
+#pragma once
 #define DH_MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
 #define DH_MAC_HEX(z) z[0], z[1], z[2], z[3], z[4], z[5]
 
@@ -8,5 +6,3 @@ struct dhcpmac_info {
 	unsigned char addr[ETH_ALEN];
 	uint8_t mask, invert;
 };
-
-#endif /* _LINUX_NETFILTER_XT_DHCPMAC_H */
diff --git a/extensions/xt_DNETMAP.h b/extensions/xt_DNETMAP.h
index 6b28fd5..97d2ea0 100644
--- a/extensions/xt_DNETMAP.h
+++ b/extensions/xt_DNETMAP.h
@@ -1,6 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_DNETMAP_H
-#define _LINUX_NETFILTER_XT_DNETMAP_H 1
-
+#pragma once
 #define DNETMAP_VERSION 2
 
 enum {
@@ -17,5 +15,3 @@ struct xt_DNETMAP_tginfo {
 	__u8 flags;
 	__s32 ttl;
 };
-
-#endif
diff --git a/extensions/xt_IPMARK.h b/extensions/xt_IPMARK.h
index 67da4e5..046aaf7 100644
--- a/extensions/xt_IPMARK.h
+++ b/extensions/xt_IPMARK.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_IPMARK_H
-#define _LINUX_NETFILTER_XT_IPMARK_H 1
+#pragma once
 
 enum {
 	XT_IPMARK_SRC,
@@ -12,5 +11,3 @@ struct xt_ipmark_tginfo {
 	__u8 selector;
 	__u8 shift;
 };
-
-#endif /* _LINUX_NETFILTER_XT_IPMARK_H */
diff --git a/extensions/xt_LOGMARK.h b/extensions/xt_LOGMARK.h
index 46ccfd0..c04722e 100644
--- a/extensions/xt_LOGMARK.h
+++ b/extensions/xt_LOGMARK.h
@@ -1,9 +1,5 @@
-#ifndef _LINUX_NETFILTER_XT_LOGMARK_TARGET_H
-#define _LINUX_NETFILTER_XT_LOGMARK_TARGET_H 1
-
+#pragma once
 struct xt_logmark_tginfo {
 	char prefix[14];
 	u_int8_t level;
 };
-
-#endif /* _LINUX_NETFILTER_XT_LOGMARK_TARGET_H */
diff --git a/extensions/xt_PROTO.h b/extensions/xt_PROTO.h
index 9f77e89..d57f825 100644
--- a/extensions/xt_PROTO.h
+++ b/extensions/xt_PROTO.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Protocol modification module for IP tables */
-
-#ifndef _XT_PROTO_H
-#define _XT_PROTO_H
-
+#pragma once
 #include <linux/types.h>
 
 enum {
@@ -16,5 +13,3 @@ struct xt_PROTO_info {
 	__u8	mode;
 	__u8	proto;
 };
-
-#endif
diff --git a/extensions/xt_TARPIT.h b/extensions/xt_TARPIT.h
index 5fb7e9f..80505dd 100644
--- a/extensions/xt_TARPIT.h
+++ b/extensions/xt_TARPIT.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_TARPIT_H
-#define _LINUX_NETFILTER_XT_TARPIT_H 1
+#pragma once
 
 enum xt_tarpit_target_variant {
 	XTTARPIT_TARPIT,
@@ -10,5 +9,3 @@ enum xt_tarpit_target_variant {
 struct xt_tarpit_tginfo {
 	uint8_t variant;
 };
-
-#endif /* _LINUX_NETFILTER_XT_TARPIT_H */
diff --git a/extensions/xt_condition.h b/extensions/xt_condition.h
index db37a31..903fb15 100644
--- a/extensions/xt_condition.h
+++ b/extensions/xt_condition.h
@@ -1,5 +1,4 @@
-#ifndef _XT_CONDITION_H
-#define _XT_CONDITION_H
+#pragma once
 
 enum {
 	CONDITION_NAME_LEN = 31,
@@ -12,5 +11,3 @@ struct xt_condition_mtinfo {
 	/* Used internally by the kernel */
 	void *condvar __attribute__((aligned(8)));
 };
-
-#endif /* _XT_CONDITION_H */
diff --git a/extensions/xt_fuzzy.h b/extensions/xt_fuzzy.h
index b3ea394..19eb42b 100644
--- a/extensions/xt_fuzzy.h
+++ b/extensions/xt_fuzzy.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_FUZZY_H
-#define _LINUX_NETFILTER_XT_FUZZY_H 1
+#pragma once
 
 enum {
 	FUZZY_MIN_RATE = 3,
@@ -16,5 +15,3 @@ struct xt_fuzzy_mtinfo {
 	uint32_t mean_rate;
 	uint8_t acceptance_rate;
 };
-
-#endif /* _LINUX_NETFILTER_XT_FUZZY_H */
diff --git a/extensions/xt_geoip.h b/extensions/xt_geoip.h
index ee6e662..ad7a56c 100644
--- a/extensions/xt_geoip.h
+++ b/extensions/xt_geoip.h
@@ -10,8 +10,7 @@
  * Samuel Jean
  * Nicolas Bouliane
  */
-#ifndef _LINUX_NETFILTER_XT_GEOIP_H
-#define _LINUX_NETFILTER_XT_GEOIP_H 1
+#pragma once
 
 enum {
 	XT_GEOIP_SRC = 1 << 0,	/* Perform check on Source IP */
@@ -54,5 +53,3 @@ struct xt_geoip_match_info {
 };
 
 #define COUNTRY(cc) ((cc) >> 8), ((cc) & 0x00FF)
-
-#endif /* _LINUX_NETFILTER_XT_GEOIP_H */
diff --git a/extensions/xt_gradm.h b/extensions/xt_gradm.h
index 96aa447..62fca47 100644
--- a/extensions/xt_gradm.h
+++ b/extensions/xt_gradm.h
@@ -1,9 +1,5 @@
-#ifndef _XT_GRADM_H
-#define _XT_GRADM_H
-
+#pragma once
 struct xt_gradm_mtinfo {
 	__u16 flags;
 	__u16 invflags;
 };
-
-#endif
diff --git a/extensions/xt_iface.h b/extensions/xt_iface.h
index b292bcf..e846b9e 100644
--- a/extensions/xt_iface.h
+++ b/extensions/xt_iface.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_IFACE_H
-#define _LINUX_NETFILTER_XT_IFACE_H 1
+#pragma once
 
 enum {
 	XT_IFACE_UP          = 1 << 0,
@@ -22,5 +21,3 @@ struct xt_iface_mtinfo {
 	__u16 flags;
 	__u16 invflags;
 };
-
-#endif
diff --git a/extensions/xt_ipp2p.h b/extensions/xt_ipp2p.h
index 0679c63..bafbe82 100644
--- a/extensions/xt_ipp2p.h
+++ b/extensions/xt_ipp2p.h
@@ -1,5 +1,4 @@
-#ifndef __IPT_IPP2P_H
-#define __IPT_IPP2P_H
+#pragma once
 #define IPP2P_VERSION "0.10"
 
 enum {
@@ -42,5 +41,3 @@ struct ipt_p2p_info {
     int cmd;
     int debug;
 };
-
-#endif //__IPT_IPP2P_H
diff --git a/extensions/xt_ipv4options.h b/extensions/xt_ipv4options.h
index a7c5f23..31bc967 100644
--- a/extensions/xt_ipv4options.h
+++ b/extensions/xt_ipv4options.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_IPV4OPTIONS_H
-#define _LINUX_NETFILTER_XT_IPV4OPTIONS_H 1
+#pragma once
 
 /* IPv4 allows for a 5-bit option number - 32 options */
 
@@ -22,5 +21,3 @@ struct xt_ipv4options_mtinfo1 {
 	__u32 invert;
 	__u8 flags;
 };
-
-#endif /* _LINUX_NETFILTER_XT_IPV4OPTIONS_H */
diff --git a/extensions/xt_length2.h b/extensions/xt_length2.h
index c708476..a038c5b 100644
--- a/extensions/xt_length2.h
+++ b/extensions/xt_length2.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_LENGTH2_H
-#define _LINUX_NETFILTER_XT_LENGTH2_H
+#pragma once
 
 enum {
 	XT_LENGTH_INVERT = 1 << 0,
@@ -18,5 +17,3 @@ struct xt_length_mtinfo2 {
 	u_int32_t min, max;
 	u_int16_t flags;
 };
-
-#endif /* _LINUX_NETFILTER_XT_LENGTH2_H */
diff --git a/extensions/xt_lscan.h b/extensions/xt_lscan.h
index 80ab85c..62139f8 100644
--- a/extensions/xt_lscan.h
+++ b/extensions/xt_lscan.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_LSCAN_H
-#define _LINUX_NETFILTER_XT_LSCAN_H 1
+#pragma once
 
 enum {
 	LSCAN_FL1_STEALTH = 1 << 0,
@@ -12,5 +11,3 @@ enum {
 struct xt_lscan_mtinfo {
 	uint8_t match_fl1, match_fl2, match_fl3, match_fl4;
 };
-
-#endif /* _LINUX_NETFILTER_XT_LSCAN_H */
diff --git a/extensions/xt_psd.h b/extensions/xt_psd.h
index 89b48fe..4b77590 100644
--- a/extensions/xt_psd.h
+++ b/extensions/xt_psd.h
@@ -1,6 +1,4 @@
-#ifndef _LINUX_NETFILTER_XT_PSD_H
-#define _LINUX_NETFILTER_XT_PSD_H 1
-
+#pragma once
 #include <linux/param.h>
 #include <linux/types.h>
 
@@ -26,5 +24,3 @@ struct xt_psd_info {
 	__u16 lo_ports_weight;
 	__u16 hi_ports_weight;
 };
-
-#endif /*_LINUX_NETFILTER_XT_PSD_H*/
diff --git a/extensions/xt_quota2.h b/extensions/xt_quota2.h
index eadc690..891f0d6 100644
--- a/extensions/xt_quota2.h
+++ b/extensions/xt_quota2.h
@@ -1,5 +1,4 @@
-#ifndef _XT_QUOTA_H
-#define _XT_QUOTA_H
+#pragma once
 
 enum xt_quota_flags {
 	XT_QUOTA_INVERT    = 1 << 0,
@@ -21,5 +20,3 @@ struct xt_quota_mtinfo2 {
 	/* Used internally by the kernel */
 	struct xt_quota_counter *master __attribute__((aligned(8)));
 };
-
-#endif /* _XT_QUOTA_H */