extensions: syntactically compact struct definitions

diff --git a/extensions/ACCOUNT/xt_ACCOUNT.h b/extensions/ACCOUNT/xt_ACCOUNT.h
index 32a92a85ac91e29e46a66790d9754e872c5d9d47..9c87f4107fd464fd1fef46e7f0baae773494b327 100644 (file)
--- a/extensions/ACCOUNT/xt_ACCOUNT.h
+++ b/extensions/ACCOUNT/xt_ACCOUNT.h
@@ -37,8 +37,7 @@
 
 /* Structure for the userspace part of ipt_ACCOUNT */
 struct ipt_acc_info {
-       __be32 net_ip;
-       __be32 net_mask;
+       __be32 net_ip, net_mask;
        char table_name[ACCOUNT_TABLE_NAME_LEN];
        int32_t table_nr;
 };
@@ -57,8 +56,5 @@ struct ipt_acc_handle_sockopt {
 */
 struct ipt_acc_handle_ip {
        __be32 ip, __dummy;
-       uint64_t src_packets;
-       uint64_t src_bytes;
-       uint64_t dst_packets;
-       uint64_t dst_bytes;
+       uint64_t src_packets, src_bytes, dst_packets, dst_bytes;
 };

diff --git a/extensions/xt_IPMARK.h b/extensions/xt_IPMARK.h
index 046aaf7b95ca10baddd2c6062161995b9aa7c4b1..818cc1941104ee6d9d74209fdc68dab4ab75ab59 100644 (file)
--- a/extensions/xt_IPMARK.h
+++ b/extensions/xt_IPMARK.h
@@ -6,8 +6,6 @@ enum {
 };
 
 struct xt_ipmark_tginfo {
-       __u32 andmask;
-       __u32 ormask;
-       __u8 selector;
-       __u8 shift;
+       __u32 andmask, ormask;
+       __u8 selector, shift;
 };

diff --git a/extensions/xt_PROTO.h b/extensions/xt_PROTO.h
index d57f8257cd22e04ee64c3f7d2d157b83b5a163f6..d901a988d0e952c36f58e39ef149ec17d473014b 100644 (file)
--- a/extensions/xt_PROTO.h
+++ b/extensions/xt_PROTO.h
@@ -10,6 +10,5 @@ enum {
 };
 
 struct xt_PROTO_info {
-       __u8    mode;
-       __u8    proto;
+       __u8 mode, proto;
 };

diff --git a/extensions/xt_fuzzy.h b/extensions/xt_fuzzy.h
index 19eb42be2429ed43bdd2114549348bbc82a0bccb..830c59df891c375b4f33d841bbfa1adf1ec95fdc 100644 (file)
--- a/extensions/xt_fuzzy.h
+++ b/extensions/xt_fuzzy.h
@@ -6,12 +6,9 @@ enum {
 };
 
 struct xt_fuzzy_mtinfo {
-       uint32_t minimum_rate;
-       uint32_t maximum_rate;
-       uint32_t packets_total;
-       uint32_t bytes_total;
-       uint32_t previous_time;
-       uint32_t present_time;
+       uint32_t minimum_rate, maximum_rate;
+       uint32_t packets_total, bytes_total;
+       uint32_t previous_time, present_time;
        uint32_t mean_rate;
        uint8_t acceptance_rate;
 };

diff --git a/extensions/xt_geoip.h b/extensions/xt_geoip.h
index ad7a56ceff30f27e1fdeae357955ee60e6718eb3..0fe36618a726093aad388934fa78b1fba2b1a9c1 100644 (file)
--- a/extensions/xt_geoip.h
+++ b/extensions/xt_geoip.h
@@ -22,8 +22,7 @@ enum {
 
 /* Yup, an address range will be passed in with host-order */
 struct geoip_subnet4 {
-       __u32 begin;
-       __u32 end;
+       __u32 begin, end;
 };
 
 struct geoip_subnet6 {
@@ -44,8 +43,7 @@ union geoip_country_group {
 };
 
 struct xt_geoip_match_info {
-       __u8 flags;
-       __u8 count;
+       __u8 flags, count;
        __u16 cc[XT_GEOIP_MAX];
 
        /* Used internally by the kernel */

diff --git a/extensions/xt_gradm.h b/extensions/xt_gradm.h
index 62fca47bb0a6b3ac734de2a41e5ee59a028d717b..141e43b8485adf5feb42b709fbba6900602bf70f 100644 (file)
--- a/extensions/xt_gradm.h
+++ b/extensions/xt_gradm.h
@@ -1,5 +1,4 @@
 #pragma once
 struct xt_gradm_mtinfo {
-       __u16 flags;
-       __u16 invflags;
+       __u16 flags, invflags;
 };

diff --git a/extensions/xt_iface.h b/extensions/xt_iface.h
index e846b9e42bc52bd61e9564ef4b802855d154665d..3d38418b91022c458cdabf6571c9e1099451c619 100644 (file)
--- a/extensions/xt_iface.h
+++ b/extensions/xt_iface.h
@@ -18,6 +18,5 @@ enum {
 
 struct xt_iface_mtinfo {
        char ifname[IFNAMSIZ];
-       __u16 flags;
-       __u16 invflags;
+       __u16 flags, invflags;
 };

diff --git a/extensions/xt_ipp2p.h b/extensions/xt_ipp2p.h
index bafbe822f5077d23311f9b2a9ab8b30ed4889b3c..1a756969f4deda7375ed40ad18d97166f473d0bc 100644 (file)
--- a/extensions/xt_ipp2p.h
+++ b/extensions/xt_ipp2p.h
@@ -38,6 +38,5 @@ enum {
 };
 
 struct ipt_p2p_info {
-    int cmd;
-    int debug;
+       int cmd, debug;
 };

diff --git a/extensions/xt_ipv4options.h b/extensions/xt_ipv4options.h
index 31bc96789e0b2952aa5c5ebbec327ad3a1a21d2b..a06fbd42a6cb457b4dad8f91dff1981665ad3ede 100644 (file)
--- a/extensions/xt_ipv4options.h
+++ b/extensions/xt_ipv4options.h
@@ -17,7 +17,6 @@ enum xt_ipv4options_flags {
  * @flags:     see above
  */
 struct xt_ipv4options_mtinfo1 {
-       __u32 map;
-       __u32 invert;
+       __u32 map, invert;
        __u8 flags;
 };

diff --git a/extensions/xt_psd.h b/extensions/xt_psd.h
index 4b77590b6ecc1e6d1ba607e8c7d7340a639416b3..513f0c13ff0278a32a6245971d7d6f26bfebd48d 100644 (file)
--- a/extensions/xt_psd.h
+++ b/extensions/xt_psd.h
@@ -19,8 +19,6 @@
 #define SCAN_WEIGHT_THRESHOLD          SCAN_MAX_COUNT
 
 struct xt_psd_info {
-       __u32 weight_threshold;
-       __u32 delay_threshold;
-       __u16 lo_ports_weight;
-       __u16 hi_ports_weight;
+       __u32 weight_threshold, delay_threshold;
+       __u16 lo_ports_weight, hi_ports_weight;
 };