Fix sparse warnings: non-ANSI function declarations, 0 used as pointer

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index 1330c4e6031a53acd198f729af4687ce6b136f38..32fcd4a5b58b00dfd0313b72ef9a3f17178428ee 100644 (file)
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -139,10 +139,10 @@ static void print(const void *ip,
 }
 
 static const struct option opts[] = {
-       { "hl-set", 1, 0, '1' },
-       { "hl-dec", 1, 0, '2' },
-       { "hl-inc", 1, 0, '3' },
-       { 0 }
+       { "hl-set", 1, NULL, '1' },
+       { "hl-dec", 1, NULL, '2' },
+       { "hl-inc", 1, NULL, '3' },
+       { }
 };
 
 static

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 7106d16c8775355e8f286eeaea37db0ceaa9b062..2001f76e5782f6266d610b65c62af124421d982b 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -33,13 +33,13 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { .name = "log-level",        .has_arg = 1, .flag = 0, .val = '!' },
-       { .name = "log-prefix",       .has_arg = 1, .flag = 0, .val = '#' },
-       { .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' },
-       { .name = "log-tcp-options",  .has_arg = 0, .flag = 0, .val = '2' },
-       { .name = "log-ip-options",   .has_arg = 0, .flag = 0, .val = '3' },
-       { .name = "log-uid",          .has_arg = 0, .flag = 0, .val = '4' },
-       { .name = 0 }
+       { .name = "log-level",        .has_arg = 1, .val = '!' },
+       { .name = "log-prefix",       .has_arg = 1, .val = '#' },
+       { .name = "log-tcp-sequence", .has_arg = 0, .val = '1' },
+       { .name = "log-tcp-options",  .has_arg = 0, .val = '2' },
+       { .name = "log-ip-options",   .has_arg = 0, .val = '3' },
+       { .name = "log-uid",          .has_arg = 0, .val = '4' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index 60a639061f727ad45528d08615001271c14db42e..3870f1b20b410d289af4eb96e668ff14613b552c 100644 (file)
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -38,7 +38,7 @@ static const struct reject_names reject_table[] = {
 };
 
 static void
-print_reject_types()
+print_reject_types(void)
 {
        unsigned int i;
 
@@ -66,8 +66,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "reject-with", 1, 0, '1' },
-       { 0 }
+       { "reject-with", 1, NULL, '1' },
+       { }
 };
 
 /* Allocate and initialize the target. */

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index e96ba201144112957fba431de7d8c926526c38dc..3b6126ca5c6e685ed57d4f65fae02285663e2a94 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -21,10 +21,10 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { .name = "ahspi", .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "ahlen", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "ahres", .has_arg = 0, .flag = 0, .val = '3' },
-       { .name = 0 }
+       { .name = "ahspi", .has_arg = 1, .val = '1' },
+       { .name = "ahlen", .has_arg = 1, .val = '2' },
+       { .name = "ahres", .has_arg = 0, .val = '3' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 2207c3f453a45981eec6b03e2a981a852cbb0204..ed60d5d0b14eb235406439031c67d81a645f6632 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -32,10 +32,10 @@ IPTABLES_VERSION, IP6T_OPTS_OPTSNR);
 }
 
 static const struct option opts[] = {
-       { .name = LNAME "-len",        .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = LNAME "-opts",       .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = LNAME "-not-strict", .has_arg = 1, .flag = 0, .val = '3' },
-       { .name = 0 }
+       { .name = LNAME "-len",        .has_arg = 1, .val = '1' },
+       { .name = LNAME "-opts",       .has_arg = 1, .val = '2' },
+       { .name = LNAME "-not-strict", .has_arg = 1, .val = '3' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 014351eec487eb68a3cccac8c80d3db71ad0cec1..05fc8b276357a4667acb6bab278ac03319b5de67 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -24,13 +24,13 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { .name = "fragid",    .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "fraglen",   .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "fragres",   .has_arg = 0, .flag = 0, .val = '3' },
-       { .name = "fragfirst", .has_arg = 0, .flag = 0, .val = '4' },
-       { .name = "fragmore",  .has_arg = 0, .flag = 0, .val = '5' },
-       { .name = "fraglast",  .has_arg = 0, .flag = 0, .val = '6' },
-       { .name = 0 }
+       { .name = "fragid",    .has_arg = 1, .val = '1' },
+       { .name = "fraglen",   .has_arg = 1, .val = '2' },
+       { .name = "fragres",   .has_arg = 0, .val = '3' },
+       { .name = "fragfirst", .has_arg = 0, .val = '4' },
+       { .name = "fragmore",  .has_arg = 0, .val = '5' },
+       { .name = "fraglast",  .has_arg = 0, .val = '6' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 533d5106029b3890b23e0b85fca863e03bde744e..229c5e74bacc15ac2f2e48cc4f8a27d4fc358998 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -31,17 +31,17 @@ UNAME , IPTABLES_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR);
 
 #if HOPBYHOP
 static const struct option opts[] = {
-       { "hbh-len", 1, 0, '1' },
-       { "hbh-opts", 1, 0, '2' },
-       { "hbh-not-strict", 1, 0, '3' },
-       {0}
+       { "hbh-len", 1, NULL, '1' },
+       { "hbh-opts", 1, NULL, '2' },
+       { "hbh-not-strict", 1, NULL, '3' },
+       { }
 };
 #else
 static const struct option opts[] = {
-       { "dst-len", 1, 0, '1' },
-       { "dst-opts", 1, 0, '2' },
-       { "dst-not-strict", 1, 0, '3' },
-       {0}
+       { "dst-len", 1, NULL, '1' },
+       { "dst-opts", 1, NULL, '2' },
+       { "dst-not-strict", 1, NULL, '3' },
+       { }
 };
 #endif
 

diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 20aff602792d0521d653d85d8ed49de61cb48c9a..e4d2ffe4847c4d84b44c6376e1803b28d2d489b8 100644 (file)
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -121,11 +121,11 @@ static void save(const void *ip,
 }
 
 static const struct option opts[] = {
-       { .name = "hl",    .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "hl-eq", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "hl-lt", .has_arg = 1, .flag = 0, .val = '3' },
-       { .name = "hl-gt", .has_arg = 1, .flag = 0, .val = '4' },
-       { 0 }
+       { .name = "hl",    .has_arg = 1, .val = '2' },
+       { .name = "hl-eq", .has_arg = 1, .val = '2' },
+       { .name = "hl-lt", .has_arg = 1, .val = '3' },
+       { .name = "hl-gt", .has_arg = 1, .val = '4' },
+       { }
 };
 
 static

diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index 5c06c04b738c88dab1c1345a7fc743401e9213c8..02108497442a244ea79a63b1e9358c9569cbb3d1 100644 (file)
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -53,7 +53,7 @@ static const struct icmpv6_names icmpv6_codes[] = {
 };
 
 static void
-print_icmpv6types()
+print_icmpv6types(void)
 {
        unsigned int i;
        printf("Valid ICMPv6 Types:");
@@ -86,8 +86,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "icmpv6-type", 1, 0, '1' },
-       {0}
+       { "icmpv6-type", 1, NULL, '1' },
+       { }
 };
 
 static void

diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 3d21f45073bb3e1ffdae8b0d1d183d1f049c125c..04749e6d6b9ea4c0f2074eb7eac66cdf6ae2cdba 100644 (file)
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -149,9 +149,9 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "header", 1, 0, '1' },
-       { "soft", 0, 0, '2' },
-       { 0 }
+       { "header", 1, NULL, '1' },
+       { "soft", 0, NULL, '2' },
+       { }
 };
 
 static void

diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index 90d12046d40c354440fb1c23efd5bb1c505f4360..99809c0efe89d7c56b59e7f7b89a400c0adb0a19 100644 (file)
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -226,8 +226,8 @@ static void save(const void *ip, const struct xt_entry_match *match)
 }
 
 static const struct option opts[] = {
-       { "mh-type", 1, 0, '1' },
-       {0}
+       { "mh-type", 1, NULL, '1' },
+       { }
 };
 
 static struct ip6tables_match mh = {

diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index 1f1c9055d705f75cacb96717e905b98207218ab5..06804b97a48e21d1e4210bf181bca76d64cd962d 100644 (file)
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -37,14 +37,14 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "uid-owner", 1, 0, '1' },
-       { "gid-owner", 1, 0, '2' },
-       { "pid-owner", 1, 0, '3' },
-       { "sid-owner", 1, 0, '4' },
+       { "uid-owner", 1, NULL, '1' },
+       { "gid-owner", 1, NULL, '2' },
+       { "pid-owner", 1, NULL, '3' },
+       { "sid-owner", 1, NULL, '4' },
 #ifdef IP6T_OWNER_COMM
-       { "cmd-owner", 1, 0, '5' },
+       { "cmd-owner", 1, NULL, '5' },
 #endif
-       {0}
+       { }
 };
 
 /* Function which parses command options; returns true if it

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index a21fd6881067d5b7b41a84af9841e56ebac05439..efcbf5ded9e8452e2e095aa4746a3c0b8142505d 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -30,13 +30,13 @@ IPTABLES_VERSION, IP6T_RT_HOPS);
 }
 
 static const struct option opts[] = {
-       { "rt-type", 1, 0, '1' },
-       { "rt-segsleft", 1, 0, '2' },
-       { "rt-len", 1, 0, '3' },
-       { "rt-0-res", 0, 0, '4' },
-       { "rt-0-addrs", 1, 0, '5' },
-       { "rt-0-not-strict", 0, 0, '6' },
-       {0}
+       { "rt-type", 1, NULL, '1' },
+       { "rt-segsleft", 1, NULL, '2' },
+       { "rt-len", 1, NULL, '3' },
+       { "rt-0-res", 0, NULL, '4' },
+       { "rt-0-addrs", 1, NULL, '5' },
+       { "rt-0-not-strict", 0, NULL, '6' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index afc782337156f5ca6a27574d05f4102df052e018..384dbdf0db88230827b6ba3f280fa17daf01441f 100644 (file)
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -45,13 +45,13 @@ IPTABLES_VERSION);
 #define PARAM_HASHINIT 0x0020
 
 static const struct option opts[] = {
-       { "new", 0, 0, '1' },
-       { "hashmode", 1, 0, '2' },
-       { "clustermac", 1, 0, '3' },
-       { "total-nodes", 1, 0, '4' },
-       { "local-node", 1, 0, '5' },
-       { "hash-init", 1, 0, '6' },
-       { 0 }
+       { "new", 0, NULL, '1' },
+       { "hashmode", 1, NULL, '2' },
+       { "clustermac", 1, NULL, '3' },
+       { "total-nodes", 1, NULL, '4' },
+       { "local-node", 1, NULL, '5' },
+       { "hash-init", 1, NULL, '6' },
+       { }
 };
 
 static void

diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index 9f48e9c503f39a8c2917c2c9a37bf5f62f37871e..98fb96600f14b2c4f03eb08d1c935fd8b33d4aba 100644 (file)
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -33,9 +33,9 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "to-destination", 1, 0, '1' },
-       { "random", 0, 0, '2' },
-       { 0 }
+       { "to-destination", 1, NULL, '1' },
+       { "random", 0, NULL, '2' },
+       { }
 };
 
 static struct ipt_natinfo *

diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c
index 6cba3619915b270ee69d5b120ff2862e45120efb..83123f3a8689ccdd6d2b6ee2325e842fde303665 100644 (file)
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -38,11 +38,11 @@ static void help(void)
 
 
 static const struct option opts[] = {
-       { "ecn-tcp-remove", 0, 0, 'F' },
-       { "ecn-tcp-cwr", 1, 0, 'G' },
-       { "ecn-tcp-ece", 1, 0, 'H' },
-       { "ecn-ip-ect", 1, 0, '9' },
-       { 0 }
+       { "ecn-tcp-remove", 0, NULL, 'F' },
+       { "ecn-tcp-cwr", 1, NULL, 'G' },
+       { "ecn-tcp-ece", 1, NULL, 'H' },
+       { "ecn-ip-ect", 1, NULL, '9' },
+       { }
 };
 
 static int

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index c0d817772eb1fc410c37b15412d72faf4ef34f30..e983904ee7aea9c6b4168bf182ae20d1d0aa37c6 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -33,13 +33,13 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { .name = "log-level",        .has_arg = 1, .flag = 0, .val = '!' },
-       { .name = "log-prefix",       .has_arg = 1, .flag = 0, .val = '#' },
-       { .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' },
-       { .name = "log-tcp-options",  .has_arg = 0, .flag = 0, .val = '2' },
-       { .name = "log-ip-options",   .has_arg = 0, .flag = 0, .val = '3' },
-       { .name = "log-uid",          .has_arg = 0, .flag = 0, .val = '4' },
-       { .name = 0 }
+       { .name = "log-level",        .has_arg = 1, .val = '!' },
+       { .name = "log-prefix",       .has_arg = 1, .val = '#' },
+       { .name = "log-tcp-sequence", .has_arg = 0, .val = '1' },
+       { .name = "log-tcp-options",  .has_arg = 0, .val = '2' },
+       { .name = "log-ip-options",   .has_arg = 0, .val = '3' },
+       { .name = "log-uid",          .has_arg = 0, .val = '4' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 36f2f2419c16b515af6fcf05baffbc1f4d9d142c..131c1dcd962203d45eeca1ccfe58928f6d189afc 100644 (file)
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -24,9 +24,9 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "to-ports", 1, 0, '1' },
-       { "random", 0, 0, '2' },
-       { 0 }
+       { "to-ports", 1, NULL, '1' },
+       { "random", 0, NULL, '2' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c
index 06115ce8c0d73b45416f8c6597ba783456e5ab6d..62f69c58d45520a08ebf67c66391615ba6d2496d 100644 (file)
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -14,8 +14,8 @@
 #define MODULENAME "NETMAP"
 
 static const struct option opts[] = {
-       { "to", 1, 0, '1' },
-       { 0 }
+       { "to", 1, NULL, '1' },
+       { }
 };
 
 /* Function which prints out usage message. */

diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 3b6fe12734dd5b5adc16b52d69f791fa279fffa8..794a208eace0ed76ca81c6ca95d5972bf5720041 100644 (file)
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -23,9 +23,9 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "to-ports", 1, 0, '1' },
-       { "random", 1, 0, '2' },
-       { 0 }
+       { "to-ports", 1, NULL, '1' },
+       { "random", 1, NULL, '2' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 4af37136d6785ca26471311eb49570e204c62f3b..90ec163f347b77b8f37c5a5c21a22df81b597f0e 100644 (file)
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -51,7 +51,7 @@ static const struct reject_names reject_table[] = {
 };
 
 static void
-print_reject_types()
+print_reject_types(void)
 {
        unsigned int i;
 
@@ -81,8 +81,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "reject-with", 1, 0, '1' },
-       { 0 }
+       { "reject-with", 1, NULL, '1' },
+       { }
 };
 
 /* Allocate and initialize the target. */

diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c
index acfbdef11ab8d2920b5c331db450de0d364855ac..3dfb702197d9a4135e7cb6999472323fbcce69ef 100644 (file)
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -30,10 +30,10 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "to", 1, 0, '1' },
-       { "nodst", 0, 0, '2'},
-       { "random", 0, 0, '3' },
-       { 0 }
+       { "to", 1, NULL, '1' },
+       { "nodst", 0, NULL, '2'},
+       { "random", 0, NULL, '3' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index 9460612dfd4658afb53e6c835ed5fb1b69114383..3fae7847a35e999182066ca2eb196d72939861f7 100644 (file)
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -33,9 +33,9 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "to-source", 1, 0, '1' },
-       { "random", 0, 0, '2' },
-       { 0 }
+       { "to-source", 1, NULL, '1' },
+       { "random", 0, NULL, '2' },
+       { }
 };
 
 static struct ipt_natinfo *

diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index ba4c5652784ff7b3485da72516dbf83984f56532..f54b08f3eaae8ad84910f718b0ace8809c77b7f0 100644 (file)
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -48,8 +48,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "set-tos", 1, 0, '1' },
-       { 0 }
+       { "set-tos", 1, NULL, '1' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c
index ed6b0fef06970e49b09270300a764a9440f1623f..644c7c46035b2dd2dd12c1f625bc174d5eee877e 100644 (file)
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -139,10 +139,10 @@ static void print(const void *ip,
 }
 
 static const struct option opts[] = {
-       { "ttl-set", 1, 0, '1' },
-       { "ttl-dec", 1, 0, '2' },
-       { "ttl-inc", 1, 0, '3' },
-       { 0 }
+       { "ttl-set", 1, NULL, '1' },
+       { "ttl-dec", 1, NULL, '2' },
+       { "ttl-inc", 1, NULL, '3' },
+       { }
 };
 
 static struct iptables_target TTL = {

diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index 84816a0d98fc597cae0f28dff5e2c95bf7cd79f4..aa98f6ea8076641322d4d00197846939fe02ca9d 100644 (file)
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -45,11 +45,11 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       {"ulog-nlgroup", 1, 0, '!'},
-       {"ulog-prefix", 1, 0, '#'},
-       {"ulog-cprange", 1, 0, 'A'},
-       {"ulog-qthreshold", 1, 0, 'B'},
-       {0}
+       {"ulog-nlgroup", 1, NULL, '!'},
+       {"ulog-prefix", 1, NULL, '#'},
+       {"ulog-cprange", 1, NULL, 'A'},
+       {"ulog-qthreshold", 1, NULL, 'B'},
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c
index c3fd3c8d67621976652b7c471a83548fa5e576c9..2036ed9b2424b1d59e85eb6f41ce42e6bc51bb31 100644 (file)
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -180,9 +180,9 @@ static void save(const void *ip,
 }
 
 static const struct option opts[] = {
-       { "src-type", 1, 0, '1' },
-       { "dst-type", 1, 0, '2' },
-       { 0 }
+       { "src-type", 1, NULL, '1' },
+       { "dst-type", 1, NULL, '2' },
+       { }
 };
 
 static

diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index daf85bd5a2ea8e36cad351fd2d13b49b1955ccfb..4f0f23c1836f7ecf6770b3b545b1868f1167be32 100644 (file)
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -20,8 +20,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "ahspi", 1, 0, '1' },
-       {0}
+       { "ahspi", 1, NULL, '1' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c
index 8f74257aa054d05468b512020dfef6804748cfb2..6ee8353c70c741c6425f1603aa54e1e899e88a74 100644 (file)
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -44,15 +44,15 @@ help(void)
 
 
 static const struct option opts[] = {
-       { "ctstate", 1, 0, '1' },
-       { "ctproto", 1, 0, '2' },
-       { "ctorigsrc", 1, 0, '3' },
-       { "ctorigdst", 1, 0, '4' },
-       { "ctreplsrc", 1, 0, '5' },
-       { "ctrepldst", 1, 0, '6' },
-       { "ctstatus", 1, 0, '7' },
-       { "ctexpire", 1, 0, '8' },
-       {0}
+       { "ctstate", 1, NULL, '1' },
+       { "ctproto", 1, NULL, '2' },
+       { "ctorigsrc", 1, NULL, '3' },
+       { "ctorigdst", 1, NULL, '4' },
+       { "ctreplsrc", 1, NULL, '5' },
+       { "ctrepldst", 1, NULL, '6' },
+       { "ctstatus", 1, NULL, '7' },
+       { "ctexpire", 1, NULL, '8' },
+       { }
 };
 
 static int

diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index d443e536e46199d07b7e6d0c9d679b6a5ff957ee..52bdf66f76b6293504f5c006451c397a13b0103f 100644 (file)
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -27,10 +27,10 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { .name = "ecn-tcp-cwr", .has_arg = 0, .flag = 0, .val = 'F' },
-       { .name = "ecn-tcp-ece", .has_arg = 0, .flag = 0, .val = 'G' },
-       { .name = "ecn-ip-ect",  .has_arg = 1, .flag = 0, .val = 'H' },
-       { .name = 0 }
+       { .name = "ecn-tcp-cwr", .has_arg = 0, .val = 'F' },
+       { .name = "ecn-tcp-ece", .has_arg = 0, .val = 'G' },
+       { .name = "ecn-ip-ect",  .has_arg = 1, .val = 'H' },
+       { }
 };
 
 static int

diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 9ee1baaa3ff522f929c12b006916bdabefcdbcb7..5be4f21ef2c991ef69cb3b04da29eab810bcf03c 100644 (file)
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -77,7 +77,7 @@ static const struct icmp_names icmp_codes[] = {
 };
 
 static void
-print_icmptypes()
+print_icmptypes(void)
 {
        unsigned int i;
        printf("Valid ICMP Types:");
@@ -110,8 +110,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "icmp-type", 1, 0, '1' },
-       {0}
+       { "icmp-type", 1, NULL, '1' },
+       { }
 };
 
 static void 

diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c
index 3c2a0143717191d12de9548dff3dd58fa4c27712..46e78259608c11a7ec3b119b883ecb19138c5780 100644 (file)
--- a/extensions/libipt_iprange.c
+++ b/extensions/libipt_iprange.c
@@ -21,9 +21,9 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "src-range", 1, 0, '1' },
-       { "dst-range", 1, 0, '2' },
-       {0}
+       { "src-range", 1, NULL, '1' },
+       { "dst-range", 1, NULL, '2' },
+       { }
 };
 
 static void

diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 2c910413d788bda96d79dc44e05737e46495e6c7..e11bfb1b2090d36ce4a0e739d25a54afb66dd0b4 100644 (file)
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -39,14 +39,14 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "uid-owner", 1, 0, '1' },
-       { "gid-owner", 1, 0, '2' },
-       { "pid-owner", 1, 0, '3' },
-       { "sid-owner", 1, 0, '4' },
+       { "uid-owner", 1, NULL, '1' },
+       { "gid-owner", 1, NULL, '2' },
+       { "pid-owner", 1, NULL, '3' },
+       { "sid-owner", 1, NULL, '4' },
 #ifdef IPT_OWNER_COMM
-       { "cmd-owner", 1, 0, '5' },
+       { "cmd-owner", 1, NULL, '5' },
 #endif
-       {0}
+       { }
 };
 
 /* Function which parses command options; returns true if it

diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 86f712590cb79b4da842e7bd66867c560a857e1f..87302433bf08c7b1abc8df209a8ad045bbc4e304 100644 (file)
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -26,8 +26,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "realm", 1, 0, '1' },
-       {0}
+       { "realm", 1, NULL, '1' },
+       { }
 };
 
 struct realmname { 
@@ -43,7 +43,7 @@ static struct realmname *realms = NULL;
 static int rdberr = 0;
 
 
-void load_realms()
+static void load_realms(void)
 {
        const char* rfnm = "/etc/iproute2/rt_realms";
        char buf[512];

diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index cad01202b5d8f457392d0274bc7d7f7283589781..002fecb1ba22b420d308ad976fd0d67ab40ad673 100644 (file)
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -23,17 +23,17 @@
 
 /* Options for this module */
 static const struct option opts[] = {
-       { .name = "set",      .has_arg = 0, .flag = 0, .val = 201 }, 
-       { .name = "rcheck",   .has_arg = 0, .flag = 0, .val = 202 }, 
-       { .name = "update",   .has_arg = 0, .flag = 0, .val = 203 },
-       { .name = "seconds",  .has_arg = 1, .flag = 0, .val = 204 }, 
-       { .name = "hitcount", .has_arg = 1, .flag = 0, .val = 205 },
-       { .name = "remove",   .has_arg = 0, .flag = 0, .val = 206 },
-       { .name = "rttl",     .has_arg = 0, .flag = 0, .val = 207 },
-       { .name = "name",     .has_arg = 1, .flag = 0, .val = 208 },
-       { .name = "rsource",  .has_arg = 0, .flag = 0, .val = 209 },
-       { .name = "rdest",    .has_arg = 0, .flag = 0, .val = 210 },
-       { .name = 0,          .has_arg = 0, .flag = 0, .val = 0   }
+       { .name = "set",      .has_arg = 0, .val = 201 }, 
+       { .name = "rcheck",   .has_arg = 0, .val = 202 }, 
+       { .name = "update",   .has_arg = 0, .val = 203 },
+       { .name = "seconds",  .has_arg = 1, .val = 204 }, 
+       { .name = "hitcount", .has_arg = 1, .val = 205 },
+       { .name = "remove",   .has_arg = 0, .val = 206 },
+       { .name = "rttl",     .has_arg = 0, .val = 207 },
+       { .name = "name",     .has_arg = 1, .val = 208 },
+       { .name = "rsource",  .has_arg = 0, .val = 209 },
+       { .name = "rdest",    .has_arg = 0, .val = 210 },
+       { }
 };
 
 /* Function which prints out usage message. */

diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 66489a9f8ae6609d040081ea2523ac6d4c4519c5..ebdd0c1ce26810ed9995f33726285821cdeb7a9e 100644 (file)
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -43,8 +43,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "tos", 1, 0, '1' },
-       {0}
+       { "tos", 1, NULL, '1' },
+       { }
 };
 
 static void

diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c
index 4b241f510d8709f8a821d6633016aea4d74ae458..b6edbc1a6977d63661d792c9b6db0c730aad7308 100644 (file)
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -144,11 +144,11 @@ static void save(const void *ip,
 }
 
 static const struct option opts[] = {
-       { "ttl", 1, 0, '2' },
-       { "ttl-eq", 1, 0, '2'},
-       { "ttl-lt", 1, 0, '3'},
-       { "ttl-gt", 1, 0, '4'},
-       { 0 }
+       { "ttl", 1, NULL, '2' },
+       { "ttl-eq", 1, NULL, '2'},
+       { "ttl-lt", 1, NULL, '3'},
+       { "ttl-gt", 1, NULL, '4'},
+       { }
 };
 
 static struct iptables_match ttl = {

diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c
index 6d637c7788a55f9da0f68a189aa83dffbfe3f734..08ad8b2be4b5856dae1587d953983b886063f41d 100644 (file)
--- a/extensions/libxt_CLASSIFY.c
+++ b/extensions/libxt_CLASSIFY.c
@@ -22,8 +22,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "set-class", 1, 0, '1' },
-       { 0 }
+       { "set-class", 1, NULL, '1' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c
index 36803230da540c0461db441fa99ec5585e5a90de..4bb068e4f40526c52e71225392f21a46c309b278 100644 (file)
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -49,11 +49,11 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "set-mark", 1, 0, '1' },
-       { "save-mark", 0, 0, '2' },
-       { "restore-mark", 0, 0, '3' },
-       { "mask", 1, 0, '4' },
-       { 0 }
+       { "set-mark", 1, NULL, '1' },
+       { "save-mark", 0, NULL, '2' },
+       { "restore-mark", 0, NULL, '3' },
+       { "mask", 1, NULL, '4' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c
index b42d99dc42da18a15169edc38f54e41c96b0c1e8..44e03cef0cdd6e49a163d790969d915e112e6121 100644 (file)
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -43,9 +43,9 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { "set-dscp", 1, 0, 'F' },
-       { "set-dscp-class", 1, 0, 'G' },
-       { 0 }
+       { "set-dscp", 1, NULL, 'F' },
+       { "set-dscp-class", 1, NULL, 'G' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c
index 3ab767d6f528aec9ba5f33d80e3b0cbb38a69d04..423e0f2a97d35a3030a46693934e7b9ecb5efd41 100644 (file)
--- a/extensions/libxt_MARK.c
+++ b/extensions/libxt_MARK.c
@@ -22,10 +22,10 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "set-mark", 1, 0, '1' },
-       { "and-mark", 1, 0, '2' },
-       { "or-mark", 1, 0, '3' },
-       { 0 }
+       { "set-mark", 1, NULL, '1' },
+       { "and-mark", 1, NULL, '2' },
+       { "or-mark", 1, NULL, '3' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c
index b42f801183a4d37a76fbc0067ff08f1eca4e9c93..0bbb8ce37524bcf5167f8272ced85eb6fde86bb8 100644 (file)
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -15,10 +15,10 @@ enum {
 };
 
 static const struct option opts[] = {
-       { "nflog-group",     1, 0, NFLOG_GROUP },
-       { "nflog-prefix",    1, 0, NFLOG_PREFIX },
-       { "nflog-range",     1, 0, NFLOG_RANGE },
-       { "nflog-threshold", 1, 0, NFLOG_THRESHOLD },
+       { "nflog-group",     1, NULL, NFLOG_GROUP },
+       { "nflog-prefix",    1, NULL, NFLOG_PREFIX },
+       { "nflog-range",     1, NULL, NFLOG_RANGE },
+       { "nflog-threshold", 1, NULL, NFLOG_THRESHOLD },
        {NULL},
 };
 

diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index 10aa152e41d9ce9c1d99ef3ba5fa2dca6f3d75eb..293ef1f0b54bb0881a2a7ed9ee7de536798240d0 100644 (file)
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -28,8 +28,8 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { "queue-num", 1, 0, 'F' },
-       { 0 }
+       { "queue-num", 1, NULL, 'F' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c
index a779b9320b2cdb92d5921e80cb7a46d362d0982b..304cf718d7b497e6fbfdf7c7211fccd49a5abda1 100644 (file)
--- a/extensions/libxt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -37,9 +37,9 @@ static void help6(void)
 }
 
 static const struct option opts[] = {
-       { "set-mss", 1, 0, '1' },
-       { "clamp-mss-to-pmtu", 0, 0, '2' },
-       { 0 }
+       { "set-mss", 1, NULL, '1' },
+       { "clamp-mss-to-pmtu", 0, NULL, '2' },
+       { }
 };
 
 /* Initialize the target. */

diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c
index 1a82f00ba23a753d4f7bb0d198ef2fb7a4aa75b1..c176173bf0238ff81a33b5f9019aedfe1ed6a3c6 100644 (file)
--- a/extensions/libxt_comment.c
+++ b/extensions/libxt_comment.c
@@ -25,8 +25,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "comment", 1, 0, '1' },
-       {0}
+       { "comment", 1, NULL, '1' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_connbytes.c b/extensions/libxt_connbytes.c
index 7a99f42568a531d64e577434e29649cf871b264f..8efde372a32b71fc22b8ca7e420a5f450c09449f 100644 (file)
--- a/extensions/libxt_connbytes.c
+++ b/extensions/libxt_connbytes.c
@@ -21,10 +21,10 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "connbytes", 1, 0, '1' },
-       { "connbytes-dir", 1, 0, '2' },
-       { "connbytes-mode", 1, 0, '3' },
-       {0}
+       { "connbytes", 1, NULL, '1' },
+       { "connbytes-dir", 1, NULL, '2' },
+       { "connbytes-mode", 1, NULL, '3' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c
index 64f6c752d5a7289e2781fded75ae15b5112ff4d6..e9d47bca095cc5cf156a7e747c6ab4393ed38232 100644 (file)
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -40,8 +40,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "mark", 1, 0, '1' },
-       {0}
+       { "mark", 1, NULL, '1' },
+       { }
 };
 
 /* Function which parses command options; returns true if it

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index 02b84f1febfc71a9c0c3df51405d95e1d58d5f8c..dcb199c4bb90148c24b3fedd73b8f0891ba14b14 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -46,13 +46,13 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "sport", .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "dport", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "dccp-types", .has_arg = 1, .flag = 0, .val = '3' },
-       { .name = "dccp-option", .has_arg = 1, .flag = 0, .val = '4' },
-       { .name = 0 }
+       { .name = "source-port", .has_arg = 1, .val = '1' },
+       { .name = "sport", .has_arg = 1, .val = '1' },
+       { .name = "destination-port", .has_arg = 1, .val = '2' },
+       { .name = "dport", .has_arg = 1, .val = '2' },
+       { .name = "dccp-types", .has_arg = 1, .val = '3' },
+       { .name = "dccp-option", .has_arg = 1, .val = '4' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index 7e0c3e4af864014d5ec8cd7dfd7a689f629ec314..e0fadd762af21a27531a36a12c4e827a03387d5d 100644 (file)
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -40,9 +40,9 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { "dscp", 1, 0, 'F' },
-       { "dscp-class", 1, 0, 'G' },
-       { 0 }
+       { "dscp", 1, NULL, 'F' },
+       { "dscp-class", 1, NULL, 'G' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 8811d6647441aad9da8f7f3d1a8921dc29ef4761..adeeec7994a62cadfba09d5ee9970edf72ec6613 100644 (file)
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -20,8 +20,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "espspi", 1, 0, '1' },
-       {0}
+       { "espspi", 1, NULL, '1' },
+       { }
 };
 
 static u_int32_t

diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c
index e845a9cde6867d622dbb6d2ef2e708f47f832fa6..fdd8cebe28964885f8ca29c277d3ad056b9f0fb6 100644 (file)
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -47,15 +47,15 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "hashlimit", 1, 0, '%' },
-       { "hashlimit-burst", 1, 0, '$' },
-       { "hashlimit-htable-size", 1, 0, '&' },
-       { "hashlimit-htable-max", 1, 0, '*' },
-       { "hashlimit-htable-gcinterval", 1, 0, '(' },
-       { "hashlimit-htable-expire", 1, 0, ')' },
-       { "hashlimit-mode", 1, 0, '_' },
-       { "hashlimit-name", 1, 0, '"' },
-       { 0 }
+       { "hashlimit", 1, NULL, '%' },
+       { "hashlimit-burst", 1, NULL, '$' },
+       { "hashlimit-htable-size", 1, NULL, '&' },
+       { "hashlimit-htable-max", 1, NULL, '*' },
+       { "hashlimit-htable-gcinterval", 1, NULL, '(' },
+       { "hashlimit-htable-expire", 1, NULL, ')' },
+       { "hashlimit-mode", 1, NULL, '_' },
+       { "hashlimit-name", 1, NULL, '"' },
+       { }
 };
 
 static

diff --git a/extensions/libxt_helper.c b/extensions/libxt_helper.c
index bce0f286acde8f84b5356b38a591da315a4495b8..9c24494f27679342829c23d6f22fe751f9b2400f 100644 (file)
--- a/extensions/libxt_helper.c
+++ b/extensions/libxt_helper.c
@@ -20,8 +20,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "helper", 1, 0, '1' },
-       {0}
+       { "helper", 1, NULL, '1' },
+       { }
 };
 
 /* Function which parses command options; returns true if it

diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c
index 79e6f41a64746a0d88542632b32e21c014dfe438..5353d2cd89daa57be39ac0775735ebc06e2e95ff 100644 (file)
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -21,8 +21,8 @@ IPTABLES_VERSION);
 }
   
 static const struct option opts[] = {
-       { "length", 1, 0, '1' },
-       {0}
+       { "length", 1, NULL, '1' },
+       { }
 };
 
 static u_int16_t

diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index c1db72a52183458345680f8ab26834d5d22e0902..e9c89c3ad23730b24257b7394312b3076aa5f00d 100644 (file)
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -31,9 +31,9 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "limit", 1, 0, '%' },
-       { "limit-burst", 1, 0, '$' },
-       { 0 }
+       { "limit", 1, NULL, '%' },
+       { "limit-burst", 1, NULL, '$' },
+       { }
 };
 
 static

diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index a9874cdf3f41d1f248f88333440cdc2b85dc5834..69fbc56f118af54dc53271c5bf06957db89f97e1 100644 (file)
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -24,8 +24,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "mac-source", 1, 0, '1' },
-       {0}
+       { "mac-source", 1, NULL, '1' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c
index 7edaf2e6c0f1716e6fbabd2117cbcd9bc2598798..84566217c43891c884d342560fb74cd8b7146750 100644 (file)
--- a/extensions/libxt_mark.c
+++ b/extensions/libxt_mark.c
@@ -21,8 +21,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "mark", 1, 0, '1' },
-       {0}
+       { "mark", 1, NULL, '1' },
+       { }
 };
 
 /* Function which parses command options; returns true if it

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index 25aa628405d8e561e924426aa79dba7f58367eb3..d47c3724ec266c5b247e88f93ce49cad949558d8 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -46,12 +46,12 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "source-ports", 1, 0, '1' },
-       { "sports", 1, 0, '1' }, /* synonym */
-       { "destination-ports", 1, 0, '2' },
-       { "dports", 1, 0, '2' }, /* synonym */
-       { "ports", 1, 0, '3' },
-       {0}
+       { "source-ports", 1, NULL, '1' },
+       { "sports", 1, NULL, '1' }, /* synonym */
+       { "destination-ports", 1, NULL, '2' },
+       { "dports", 1, NULL, '2' }, /* synonym */
+       { "ports", 1, NULL, '3' },
+       { }
 };
 
 static char *

diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index ed58501b81009debbdd2353888b67839934a5458..2be6bd18423aa68c9c29e876b7a4d20ce09847a4 100644 (file)
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -26,12 +26,12 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "physdev-in", 1, 0, '1' },
-       { "physdev-out", 1, 0, '2' },
-       { "physdev-is-in", 0, 0, '3' },
-       { "physdev-is-out", 0, 0, '4' },
-       { "physdev-is-bridged", 0, 0, '5' },
-       {0}
+       { "physdev-in", 1, NULL, '1' },
+       { "physdev-out", 1, NULL, '2' },
+       { "physdev-is-in", 0, NULL, '3' },
+       { "physdev-is-out", 0, NULL, '4' },
+       { "physdev-is-bridged", 0, NULL, '5' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c
index 85e43eafd4e7d6dd51357f69408f06eba66a2314..cbb78be4ab64522e0abb7a6343421e318054a244 100644 (file)
--- a/extensions/libxt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -41,7 +41,7 @@ static const struct pkttypes supported_types[] = {
        {"host", PACKET_HOST, 0, NULL}
 };
 
-static void print_types()
+static void print_types(void)
 {
        unsigned int    i;
        
@@ -65,8 +65,8 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       {"pkt-type", 1, 0, '1'},
-       {0}
+       {"pkt-type", 1, NULL, '1'},
+       { }
 };
 
 static void parse_pkttype(const char *pkttype, struct xt_pkttype_info *info)

diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index 1d3ef6341023d7013f8a962afe883d2cbfac2695..12a3371e2ad123ff501ab90b975ec29f367412af 100644 (file)
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -12,8 +12,8 @@
 #include <linux/netfilter/xt_quota.h>
 
 static const struct option opts[] = {
-        {"quota", 1, 0, '1'},
-        {0}
+        {"quota", 1, NULL, '1'},
+        { }
 };
 
 /* print usage */

diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 39553bf5d4033e06fc52ec2b69372fc37771c8dc..c816b99b8ca6cfe287b093fac6277d16b39d4c34 100644 (file)
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -69,12 +69,12 @@ static void help(void)
 }
 
 static const struct option opts[] = {
-       { .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "sport", .has_arg = 1, .flag = 0, .val = '1' },
-       { .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "dport", .has_arg = 1, .flag = 0, .val = '2' },
-       { .name = "chunk-types", .has_arg = 1, .flag = 0, .val = '3' },
-       { .name = 0 }
+       { .name = "source-port", .has_arg = 1, .val = '1' },
+       { .name = "sport", .has_arg = 1, .val = '1' },
+       { .name = "destination-port", .has_arg = 1, .val = '2' },
+       { .name = "dport", .has_arg = 1, .val = '2' },
+       { .name = "chunk-types", .has_arg = 1, .val = '3' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_state.c b/extensions/libxt_state.c
index 8d193faa3c263537e24086bf77cef17b9d2df15c..067b4080c41ecad4f677f20e020ce9bcc46ec2b7 100644 (file)
--- a/extensions/libxt_state.c
+++ b/extensions/libxt_state.c
@@ -24,8 +24,8 @@ help(void)
 }
 
 static const struct option opts[] = {
-       { "state", 1, 0, '1' },
-       {0}
+       { "state", 1, NULL, '1' },
+       { }
 };
 
 static int

diff --git a/extensions/libxt_statistic.c b/extensions/libxt_statistic.c
index d2210faf19f99d6cad7d0d6da4cded8fc18ebafe..dc0540265756bfd661c114919188a4114036fdf5 100644 (file)
--- a/extensions/libxt_statistic.c
+++ b/extensions/libxt_statistic.c
@@ -24,11 +24,11 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "mode", 1, 0, '1' },
-       { "probability", 1, 0, '2' },
-       { "every", 1, 0, '3' },
-       { "packet", 1, 0, '4' },
-       { 0 }
+       { "mode", 1, NULL, '1' },
+       { "probability", 1, NULL, '2' },
+       { "every", 1, NULL, '3' },
+       { "packet", 1, NULL, '4' },
+       { }
 };
 
 static struct xt_statistic_info *info;

diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index 698504d0a2718f84c2b75fa82b1dd6de50d39726..2e94eed8b589575bcf1523e42bd342ad80d5c805 100644 (file)
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -45,12 +45,12 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "from", 1, 0, '1' },
-       { "to", 1, 0, '2' },
-       { "algo", 1, 0, '3' },
-       { "string", 1, 0, '4' },
-       { "hex-string", 1, 0, '5' },
-       {0}
+       { "from", 1, NULL, '1' },
+       { "to", 1, NULL, '2' },
+       { "algo", 1, NULL, '3' },
+       { "string", 1, NULL, '4' },
+       { "hex-string", 1, NULL, '5' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index 2c1a21a3ebad6f118ba8bd08ded4257bd3f2c100..8c1b82cc233d5a764530d5ea5c56c539ee8bc672 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -28,14 +28,14 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "source-port", 1, 0, '1' },
-       { "sport", 1, 0, '1' }, /* synonym */
-       { "destination-port", 1, 0, '2' },
-       { "dport", 1, 0, '2' }, /* synonym */
-       { "syn", 0, 0, '3' },
-       { "tcp-flags", 1, 0, '4' },
-       { "tcp-option", 1, 0, '5' },
-       {0}
+       { "source-port", 1, NULL, '1' },
+       { "sport", 1, NULL, '1' }, /* synonym */
+       { "destination-port", 1, NULL, '2' },
+       { "dport", 1, NULL, '2' }, /* synonym */
+       { "syn", 0, NULL, '3' },
+       { "tcp-flags", 1, NULL, '4' },
+       { "tcp-option", 1, NULL, '5' },
+       { }
 };
 
 static void

diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c
index df56879b2366f452644a5fecc2d221ff0228bea5..23336fd9a3e5d10b2bb5dad6c9c21d6c449df1e1 100644 (file)
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -20,8 +20,8 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "mss", 1, 0, '1' },
-       {0}
+       { "mss", 1, NULL, '1' },
+       { }
 };
 
 static u_int16_t

diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index dcfa48d6a5cc7bc2109a45070cd257ef47717862..734a0a88d549db4311e53320a07b45fbc5911c9a 100644 (file)
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -23,11 +23,11 @@ IPTABLES_VERSION);
 }
 
 static const struct option opts[] = {
-       { "source-port", 1, 0, '1' },
-       { "sport", 1, 0, '1' }, /* synonym */
-       { "destination-port", 1, 0, '2' },
-       { "dport", 1, 0, '2' }, /* synonym */
-       {0}
+       { "source-port", 1, NULL, '1' },
+       { "sport", 1, NULL, '1' }, /* synonym */
+       { "destination-port", 1, NULL, '2' },
+       { "dport", 1, NULL, '2' }, /* synonym */
+       { }
 };
 
 static void