[netfilter-cvslog] r3689 - in trunk/patch-o-matic-ng: comment/iptables/extensions ipp2p/iptables/extensions tproxy/iptables/extensions

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-02-15 00:12:54 +0100 (Tue, 15 Feb 2005)
New Revision: 3689

Modified:
   trunk/patch-o-matic-ng/comment/iptables/extensions/libipt_comment.c
   trunk/patch-o-matic-ng/ipp2p/iptables/extensions/libipt_ipp2p.c
   trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_TPROXY.c
   trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_tproxy.c
Log:
C99 style initializers (Torsten Luettgert)


Modified: trunk/patch-o-matic-ng/comment/iptables/extensions/libipt_comment.c
===================================================================
--- trunk/patch-o-matic-ng/comment/iptables/extensions/libipt_comment.c	2005-02-14 23:09:23 UTC (rev 3688)
+++ trunk/patch-o-matic-ng/comment/iptables/extensions/libipt_comment.c	2005-02-14 23:12:54 UTC (rev 3689)
@@ -105,18 +105,18 @@
 
 static
 struct iptables_match comment
-= { NULL,
-    "comment",
-    IPTABLES_VERSION,
-    IPT_ALIGN(sizeof(struct ipt_comment_info)),
-    IPT_ALIGN(sizeof(struct ipt_comment_info)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+= { .next            = NULL,
+    .name            = "comment",
+    .version         = IPTABLES_VERSION,
+    .size            = IPT_ALIGN(sizeof(struct ipt_comment_info)),
+    .userspacesize   = IPT_ALIGN(sizeof(struct ipt_comment_info)),
+    .help            = &help,
+    .init            = &init,
+    .parse           = &parse,
+    .final_check     = &final_check,
+    .print           = &print,
+    .save            = &save,
+    .extra_opts      = opts
 };
 
 void _init(void)

Modified: trunk/patch-o-matic-ng/ipp2p/iptables/extensions/libipt_ipp2p.c
===================================================================
--- trunk/patch-o-matic-ng/ipp2p/iptables/extensions/libipt_ipp2p.c	2005-02-14 23:09:23 UTC (rev 3688)
+++ trunk/patch-o-matic-ng/ipp2p/iptables/extensions/libipt_ipp2p.c	2005-02-14 23:12:54 UTC (rev 3689)
@@ -431,18 +431,19 @@
 
 static
 struct iptables_match ipp2p
-= { NULL,
-    "ipp2p",
-    IPTABLES_VERSION, 
-    IPT_ALIGN(sizeof(struct ipt_p2p_info)),
-    IPT_ALIGN(sizeof(struct ipt_p2p_info)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+= {
+   .next          = NULL,
+   .name          = "ipp2p",
+   .version       = IPTABLES_VERSION, 
+   .size          = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
+   .userspacesize = IPT_ALIGN(sizeof(struct ipt_p2p_info)),
+   .help          = &help,
+   .init          = &init,
+   .parse         = &parse,
+   .final_check   = &final_check,
+   .print         = &print,
+   .save          = &save,
+   .extra_opts    = opts
 };
 					    
 

Modified: trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_TPROXY.c
===================================================================
--- trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_TPROXY.c	2005-02-14 23:09:23 UTC (rev 3688)
+++ trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_TPROXY.c	2005-02-14 23:12:54 UTC (rev 3689)
@@ -118,18 +118,19 @@
 }
 
 struct iptables_target tproxy
-= { NULL,
-    "TPROXY",
-    IPTABLES_VERSION,
-    IPT_ALIGN(sizeof(struct ipt_tproxy_target_info)),
-    IPT_ALIGN(sizeof(struct ipt_tproxy_target_info)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+= {
+   .next            = NULL,
+   .name            = "TPROXY",
+   .version         = IPTABLES_VERSION,
+   .size            = IPT_ALIGN(sizeof(struct ipt_tproxy_target_info)),
+   .userspacesize   = IPT_ALIGN(sizeof(struct ipt_tproxy_target_info)),
+   .help            = &help,
+   .init            = &init,
+   .parse           = &parse,
+   .final_check     = &final_check,
+   .print           = &print,
+   .save            = &save,
+   .extra_opts      = opts
 };
 
 void _init(void)

Modified: trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_tproxy.c
===================================================================
--- trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_tproxy.c	2005-02-14 23:09:23 UTC (rev 3688)
+++ trunk/patch-o-matic-ng/tproxy/iptables/extensions/libipt_tproxy.c	2005-02-14 23:12:54 UTC (rev 3689)
@@ -57,18 +57,18 @@
 
 static
 struct iptables_match tproxy
-= { NULL,
-    "tproxy",
-    IPTABLES_VERSION,
-    0, 
-    0, 
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+= { .next            = NULL,
+    .name            = "tproxy",
+    .version         = IPTABLES_VERSION,
+    .size            = 0, 
+    .userspacesize   = 0, 
+    .help            = &help,
+    .init            = &init,
+    .parse           = &parse,
+    .final_check     = &final_check,
+    .print           = &print,
+    .save            = &save,
+    .extra_opts      = opts
 };
 
 void _init(void)