Fix sparse warnings: non-ANSI function declarations, 0 used as pointer
diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index 1330c4e..32fcd4a 100644
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -139,10 +139,10 @@
}
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 7106d16..2001f76 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -33,13 +33,13 @@
}
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 60a6390..3870f1b 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -38,7 +38,7 @@
};
static void
-print_reject_types()
+print_reject_types(void)
{
unsigned int i;
@@ -66,8 +66,8 @@
}
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 e96ba20..3b6126c 100644
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -21,10 +21,10 @@
}
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 2207c3f..ed60d5d 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -32,10 +32,10 @@
}
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 014351e..05fc8b2 100644
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -24,13 +24,13 @@
}
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 533d510..229c5e7 100644
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -31,17 +31,17 @@
#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 20aff60..e4d2ffe 100644
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -121,11 +121,11 @@
}
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 5c06c04..0210849 100644
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -53,7 +53,7 @@
};
static void
-print_icmpv6types()
+print_icmpv6types(void)
{
unsigned int i;
printf("Valid ICMPv6 Types:");
@@ -86,8 +86,8 @@
}
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 3d21f45..04749e6 100644
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -149,9 +149,9 @@
}
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 90d1204..99809c0 100644
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -226,8 +226,8 @@
}
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 1f1c905..06804b9 100644
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -37,14 +37,14 @@
}
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 a21fd68..efcbf5d 100644
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -30,13 +30,13 @@
}
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 afc7823..384dbdf 100644
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -45,13 +45,13 @@
#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 9f48e9c..98fb966 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -33,9 +33,9 @@
}
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 6cba361..83123f3 100644
--- a/extensions/libipt_ECN.c
+++ b/extensions/libipt_ECN.c
@@ -38,11 +38,11 @@
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 c0d8177..e983904 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -33,13 +33,13 @@
}
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 36f2f24..131c1dc 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -24,9 +24,9 @@
}
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 06115ce..62f69c5 100644
--- 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 3b6fe12..794a208 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -23,9 +23,9 @@
}
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 4af3713..90ec163 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -51,7 +51,7 @@
};
static void
-print_reject_types()
+print_reject_types(void)
{
unsigned int i;
@@ -81,8 +81,8 @@
}
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 acfbdef..3dfb702 100644
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -30,10 +30,10 @@
}
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 9460612..3fae784 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -33,9 +33,9 @@
}
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 ba4c565..f54b08f 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -48,8 +48,8 @@
}
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 ed6b0fe..644c7c4 100644
--- a/extensions/libipt_TTL.c
+++ b/extensions/libipt_TTL.c
@@ -139,10 +139,10 @@
}
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 84816a0..aa98f6e 100644
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -45,11 +45,11 @@
}
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 c3fd3c8..2036ed9 100644
--- a/extensions/libipt_addrtype.c
+++ b/extensions/libipt_addrtype.c
@@ -180,9 +180,9 @@
}
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 daf85bd..4f0f23c 100644
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -20,8 +20,8 @@
}
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 8f74257..6ee8353 100644
--- a/extensions/libipt_conntrack.c
+++ b/extensions/libipt_conntrack.c
@@ -44,15 +44,15 @@
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 d443e53..52bdf66 100644
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -27,10 +27,10 @@
}
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 9ee1baa..5be4f21 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -77,7 +77,7 @@
};
static void
-print_icmptypes()
+print_icmptypes(void)
{
unsigned int i;
printf("Valid ICMP Types:");
@@ -110,8 +110,8 @@
}
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 3c2a014..46e7825 100644
--- a/extensions/libipt_iprange.c
+++ b/extensions/libipt_iprange.c
@@ -21,9 +21,9 @@
}
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 2c91041..e11bfb1 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -39,14 +39,14 @@
}
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 86f7125..8730243 100644
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -26,8 +26,8 @@
}
static const struct option opts[] = {
- { "realm", 1, 0, '1' },
- {0}
+ { "realm", 1, NULL, '1' },
+ { }
};
struct realmname {
@@ -43,7 +43,7 @@
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 cad0120..002fecb 100644
--- 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 66489a9..ebdd0c1 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -43,8 +43,8 @@
}
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 4b241f5..b6edbc1 100644
--- a/extensions/libipt_ttl.c
+++ b/extensions/libipt_ttl.c
@@ -144,11 +144,11 @@
}
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 6d637c7..08ad8b2 100644
--- a/extensions/libxt_CLASSIFY.c
+++ b/extensions/libxt_CLASSIFY.c
@@ -22,8 +22,8 @@
}
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 3680323..4bb068e 100644
--- a/extensions/libxt_CONNMARK.c
+++ b/extensions/libxt_CONNMARK.c
@@ -49,11 +49,11 @@
}
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 b42d99d..44e03ce 100644
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -43,9 +43,9 @@
}
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 3ab767d..423e0f2 100644
--- a/extensions/libxt_MARK.c
+++ b/extensions/libxt_MARK.c
@@ -22,10 +22,10 @@
}
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 b42f801..0bbb8ce 100644
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -15,10 +15,10 @@
};
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 10aa152..293ef1f 100644
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -28,8 +28,8 @@
}
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 a779b93..304cf71 100644
--- a/extensions/libxt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -37,9 +37,9 @@
}
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 1a82f00..c176173 100644
--- a/extensions/libxt_comment.c
+++ b/extensions/libxt_comment.c
@@ -25,8 +25,8 @@
}
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 7a99f42..8efde37 100644
--- a/extensions/libxt_connbytes.c
+++ b/extensions/libxt_connbytes.c
@@ -21,10 +21,10 @@
}
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 64f6c75..e9d47bc 100644
--- a/extensions/libxt_connmark.c
+++ b/extensions/libxt_connmark.c
@@ -40,8 +40,8 @@
}
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 02b84f1..dcb199c 100644
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -46,13 +46,13 @@
}
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 7e0c3e4..e0fadd7 100644
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -40,9 +40,9 @@
}
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 8811d66..adeeec7 100644
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -20,8 +20,8 @@
}
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 e845a9c..fdd8ceb 100644
--- a/extensions/libxt_hashlimit.c
+++ b/extensions/libxt_hashlimit.c
@@ -47,15 +47,15 @@
}
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 bce0f28..9c24494 100644
--- a/extensions/libxt_helper.c
+++ b/extensions/libxt_helper.c
@@ -20,8 +20,8 @@
}
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 79e6f41..5353d2c 100644
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -21,8 +21,8 @@
}
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 c1db72a..e9c89c3 100644
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -31,9 +31,9 @@
}
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 a9874cd..69fbc56 100644
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -24,8 +24,8 @@
}
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 7edaf2e..8456621 100644
--- a/extensions/libxt_mark.c
+++ b/extensions/libxt_mark.c
@@ -21,8 +21,8 @@
}
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 25aa628..d47c372 100644
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -46,12 +46,12 @@
}
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 ed58501..2be6bd1 100644
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -26,12 +26,12 @@
}
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 85e43ea..cbb78be 100644
--- a/extensions/libxt_pkttype.c
+++ b/extensions/libxt_pkttype.c
@@ -41,7 +41,7 @@
{"host", PACKET_HOST, 0, NULL}
};
-static void print_types()
+static void print_types(void)
{
unsigned int i;
@@ -65,8 +65,8 @@
}
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 1d3ef63..12a3371 100644
--- 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 39553bf..c816b99 100644
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -69,12 +69,12 @@
}
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 8d193fa..067b408 100644
--- a/extensions/libxt_state.c
+++ b/extensions/libxt_state.c
@@ -24,8 +24,8 @@
}
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 d2210fa..dc05402 100644
--- a/extensions/libxt_statistic.c
+++ b/extensions/libxt_statistic.c
@@ -24,11 +24,11 @@
}
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 698504d..2e94eed 100644
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -45,12 +45,12 @@
}
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 2c1a21a..8c1b82c 100644
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -28,14 +28,14 @@
}
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 df56879..23336fd 100644
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -20,8 +20,8 @@
}
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 dcfa48d..734a0a8 100644
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -23,11 +23,11 @@
}
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