Delete empty ->final_check() functions

Deletes empty ->final_check() functions, and makes ip[6]tables
checks for NULL on these.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 2001f76e5782f6266d610b65c62af124421d982b..737a597e2651fc752557c3e94c7daca726daa631 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -199,11 +199,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out the targinfo. */
 static void
 print(const void *ip,
@@ -278,7 +273,6 @@ struct ip6tables_target log
     .help          = &help,
     .init          = &init,
     .parse         = &parse,
-    .final_check   = &final_check,
     .print         = &print,
     .save          = &save,
     .extra_opts    = opts

diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index 3870f1b20b410d289af4eb96e668ff14613b552c..1d8c5d5ae0e9599c03e6e44c60394c40788d08ab 100644 (file)
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -113,11 +113,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out ipt_reject_info. */
 static void
 print(const void *ip,
@@ -158,7 +153,6 @@ struct ip6tables_target reject = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index 3b6126ca5c6e685ed57d4f65fae02285663e2a94..0b8652d57e77cbbb2750c5c8b0fb4c84fee5d518 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -125,12 +125,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_spis(const char *name, u_int32_t min, u_int32_t max,
            int invert)
@@ -213,7 +207,6 @@ struct ip6tables_match ah = {
        .help          = &help,
        .init          = &init,
        .parse         = &parse,
-       .final_check   = &final_check,
        .print         = &print,
        .save          = &save,
        .extra_opts    = opts

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index ed60d5d0b14eb235406439031c67d81a645f6632..d1662fdaf949179bf018fadfdabb162ecd8c6a73 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -179,12 +179,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_options(int optsnr, u_int16_t *optsp)
 {
@@ -255,7 +249,6 @@ struct ip6tables_match optstruct = {
        .help          = &help,
        .init          = &init,
        .parse         = &parse,
-       .final_check   = &final_check,
        .print         = &print,
        .save          = &save,
        .extra_opts    = opts

diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c
index a38af34e014ba0506bd0395eefb14a0980ee490d..f6830d4b8277129f3ce97e71c31cfed7e05f497a 100644 (file)
--- a/extensions/libip6t_eui64.c
+++ b/extensions/libip6t_eui64.c
@@ -32,11 +32,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-/* Final check */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out the matchinfo. */
 static void
 print(const void *ip,
@@ -59,7 +54,6 @@ static struct ip6tables_match eui64 = {
        .userspacesize  = IP6T_ALIGN(sizeof(int)),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
 };

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 05fc8b276357a4667acb6bab278ac03319b5de67..49044a53c7736f987df646e0400e0578bc74e8a2 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -156,12 +156,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_ids(const char *name, u_int32_t min, u_int32_t max,
            int invert)
@@ -258,7 +252,6 @@ struct ip6tables_match frag = {
        .help          = &help,
        .init          = &init,
        .parse         = &parse,
-       .final_check   = &final_check,
        .print         = &print,
        .save          = &save,
        .extra_opts    = opts

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 229c5e74bacc15ac2f2e48cc4f8a27d4fc358998..09363b42b5d143b044288a009f8ae2a2fb47b743 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -177,12 +177,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_options(int optsnr, u_int16_t *optsp)
 {
@@ -248,7 +242,6 @@ static struct ip6tables_match optstruct = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,

diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index 99809c0efe89d7c56b59e7f7b89a400c0adb0a19..24ab4995c1209409088c0eb1171bf371dbbe2eed 100644 (file)
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -150,11 +150,6 @@ static int parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void final_check(unsigned int flags)
-{
-}
-
 static const char *type_to_name(u_int8_t type)
 {
        unsigned int i;
@@ -238,7 +233,6 @@ static struct ip6tables_match mh = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index efcbf5ded9e8452e2e095aa4746a3c0b8142505d..036f1011a753e21f6ab190a8b2cd3169df5248d6 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -237,12 +237,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_nums(const char *name, u_int32_t min, u_int32_t max,
            int invert)
@@ -348,7 +342,6 @@ static struct ip6tables_match rt = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index e983904ee7aea9c6b4168bf182ae20d1d0aa37c6..cf8990ae272939ecec988262949222e0d0c0ee8e 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -199,11 +199,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out the targinfo. */
 static void
 print(const void *ip,
@@ -278,7 +273,6 @@ struct iptables_target log
     .help          = &help,
     .init          = &init,
     .parse         = &parse,
-    .final_check   = &final_check,
     .print         = &print,
     .save          = &save,
     .extra_opts    = opts

diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 5796b27ef43d55544cb9663c1af42b1e73ca6956..c502667341b564ad0c5181f13aad0d46815a400a 100644 (file)
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -115,11 +115,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        }
 }
 
-/* Final check; don't care. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out the targinfo. */
 static void
 print(const void *ip,
@@ -169,7 +164,6 @@ static struct iptables_target masq = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_MIRROR.c b/extensions/libipt_MIRROR.c
index 292b13dc8d4de7272be58aa181317159dbd673e1..a75ff9c8f0c7aa85a7d2ad1ca9d5d7e9499f9f6f 100644 (file)
--- a/extensions/libipt_MIRROR.c
+++ b/extensions/libipt_MIRROR.c
@@ -26,11 +26,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 static struct iptables_target mirror = {
        .name           = "MIRROR",
        .version        = IPTABLES_VERSION,
@@ -38,7 +33,6 @@ static struct iptables_target mirror = {
        .userspacesize  = IPT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL,
        .save           = NULL,
 };

diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 794a208eace0ed76ca81c6ca95d5972bf5720041..8fa1c325338a70933911750b225b70227f6707d9 100644 (file)
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -124,11 +124,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        }
 }
 
-/* Final check; don't care. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out the targinfo. */
 static void
 print(const void *ip,
@@ -177,7 +172,6 @@ static struct iptables_target redir = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 90ec163f347b77b8f37c5a5c21a22df81b597f0e..c2b3b35e0d517f497ef9980b08d5d759829d6b02 100644 (file)
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -132,11 +132,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Prints out ipt_reject_info. */
 static void
 print(const void *ip,
@@ -176,7 +171,6 @@ static struct iptables_target reject = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c
index aa98f6ea8076641322d4d00197846939fe02ca9d..2fda85d1c899805ae76a7bdbae19909d53c0d643 100644 (file)
--- a/extensions/libipt_ULOG.c
+++ b/extensions/libipt_ULOG.c
@@ -150,11 +150,6 @@ static int parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Saves the union ipt_targinfo in parsable form to stdout. */
 static void save(const void *ip,
                 const struct xt_entry_target *target)
@@ -200,7 +195,6 @@ static struct iptables_target ulog = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index 4f0f23c1836f7ecf6770b3b545b1868f1167be32..22a13d15f4ef285c67729e146ca07c28c40491ff 100644 (file)
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -104,12 +104,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_spis(const char *name, u_int32_t min, u_int32_t max,
            int invert)
@@ -175,7 +169,6 @@ static struct iptables_match ah = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 5be4f21ef2c991ef69cb3b04da29eab810bcf03c..0c1fbe741f35ebbdc4ab6f579bbb60ffada768b2 100644 (file)
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -280,11 +280,6 @@ static void save(const void *ip, const struct xt_entry_match *match)
        }
 }
 
-/* Final check; we don't care. We can pass 0xFF to match any type */
-static void final_check(unsigned int flags)
-{
-}
-
 static struct iptables_match icmp = { 
        .name           = "icmp",
        .version        = IPTABLES_VERSION,
@@ -293,7 +288,6 @@ static struct iptables_match icmp = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index 9f7712a3faab477bc7f787e6d5f9ebe4da5d3e57..2916bc3b888d17e250460a3c9cf6114a34cc0b7a 100644 (file)
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -23,11 +23,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-/* Final check; must have specified --mac. */
-static void final_check(unsigned int flags)
-{
-}
-
 static
 struct iptables_match unclean = { 
        .name           = "unclean",
@@ -36,7 +31,6 @@ struct iptables_match unclean = {
        .userspacesize  = IPT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL,
        .save           = NULL,
 };

diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c
index 0bbb8ce37524bcf5167f8272ced85eb6fde86bb8..11e47a4263eab7070c9c968d8baaa57eef90a4f5 100644 (file)
--- a/extensions/libxt_NFLOG.c
+++ b/extensions/libxt_NFLOG.c
@@ -110,11 +110,6 @@ static int parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-static void final_check(unsigned int flags)
-{
-       return;
-}
-
 static void nflog_print(const struct xt_nflog_info *info, char *prefix)
 {
        if (info->prefix[0] != '\0')
@@ -151,7 +146,6 @@ static struct xtables_target nflog = {
        .help           = help,
        .init           = init,
        .parse          = parse,
-       .final_check    = final_check,
        .print          = print,
        .save           = save,
        .extra_opts     = opts,
@@ -166,7 +160,6 @@ static struct xtables_target nflog6 = {
        .help           = help,
        .init           = init,
        .parse          = parse,
-       .final_check    = final_check,
        .print          = print,
        .save           = save,
        .extra_opts     = opts,

diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index f023bbcf82524e5fce73a2bd738b6accb748243f..820d5a1b930052dcda69a42b556c01faad74e331 100644 (file)
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -63,11 +63,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 /* Prints out the targinfo. */
 static void
 print(const void *ip,
@@ -97,7 +92,6 @@ static struct xtables_target nfqueue = {
        .userspacesize  = XT_ALIGN(sizeof(struct xt_NFQ_info)),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -111,7 +105,6 @@ static struct xtables_target nfqueue6 = {
        .userspacesize  = XT_ALIGN(sizeof(struct xt_NFQ_info)),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_NOTRACK.c b/extensions/libxt_NOTRACK.c
index 8e2375392581743fa08836be7b47add6b4eb8f11..3a01475dda146deeda5588f0c6c920b9df33ad86 100644 (file)
--- a/extensions/libxt_NOTRACK.c
+++ b/extensions/libxt_NOTRACK.c
@@ -26,11 +26,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 static
 struct xtables_target notrack =
 {
@@ -41,7 +36,6 @@ struct xtables_target notrack =
        .userspacesize  = XT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
 };
 
 static
@@ -54,7 +48,6 @@ struct xtables_target notrack6 =
        .userspacesize  = XT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
 };
 
 void _init(void)

diff --git a/extensions/libxt_TRACE.c b/extensions/libxt_TRACE.c
index afe5498d1e55502c007ee979e05e2133a44d798e..48015e5e636413e5b2dd25b4d271af789cd625ab 100644 (file)
--- a/extensions/libxt_TRACE.c
+++ b/extensions/libxt_TRACE.c
@@ -26,11 +26,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 static struct xtables_target trace = {
        .family         = AF_INET,
        .name           = "TRACE",
@@ -39,7 +34,6 @@ static struct xtables_target trace = {
        .userspacesize  = XT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL, /* print */
        .save           = NULL, /* save */
 };
@@ -52,7 +46,6 @@ static struct xtables_target trace6 = {
        .userspacesize  = XT_ALIGN(0),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL, /* print */
        .save           = NULL, /* save */
 };

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index dcb199c4bb90148c24b3fedd73b8f0891ba14b14..b6818cc5cc873b6e62bd6aca733b14c0171d0adf 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -193,11 +193,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 static char *
 port_to_service(int port)
 {
@@ -360,7 +355,6 @@ static struct xtables_match dccp =
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -376,7 +370,6 @@ static struct xtables_match dccp6 =
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index adeeec7994a62cadfba09d5ee9970edf72ec6613..6faaba68697718d535c54f6972dbd1f3e8abb6c8 100644 (file)
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -107,12 +107,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static void
 print_spis(const char *name, u_int32_t min, u_int32_t max,
            int invert)
@@ -172,7 +166,6 @@ static struct xtables_match esp = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -187,7 +180,6 @@ static struct xtables_match esp6 = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
index e9c89c3ad23730b24257b7394312b3076aa5f00d..13468ebaadcdf849d744a19468f1b37adc3754d6 100644 (file)
--- a/extensions/libxt_limit.c
+++ b/extensions/libxt_limit.c
@@ -126,11 +126,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; nothing. */
-static void final_check(unsigned int flags)
-{
-}
-
 static struct rates
 {
        const char *name;
@@ -183,7 +178,6 @@ static struct xtables_match limit = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -198,7 +192,6 @@ static struct xtables_match limit6 = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index 12a3371e2ad123ff501ab90b975ec29f367412af..0e04d20352c95b4a55ac2c3c6853855f842d80c5 100644 (file)
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -79,12 +79,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
         return 1;
 }
 
-/* no final check */
-static void
-final_check(unsigned int flags)
-{
-}
-
 struct xtables_match quota = { 
        .family         = AF_INET,
        .name           = "quota",
@@ -93,7 +87,6 @@ struct xtables_match quota = {
        .userspacesize  = offsetof(struct xt_quota_info, quota),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -107,7 +100,6 @@ struct xtables_match quota6 = {
        .userspacesize  = offsetof(struct xt_quota_info, quota),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index c816b99b8ca6cfe287b093fac6277d16b39d4c34..2768ca595b0ca9b5c3b20a723e9d2965e7f56d72 100644 (file)
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -317,11 +317,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-static void
-final_check(unsigned int flags)
-{
-}
-
 static char *
 port_to_service(int port)
 {
@@ -534,7 +529,6 @@ static struct xtables_match sctp = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -549,7 +543,6 @@ static struct xtables_match sctp6 = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/extensions/libxt_standard.c b/extensions/libxt_standard.c
index 48ba85a26853407ae00ee3c183a551083d106867..078f9ca5485509d20dcea3b2374c566c5486d751 100644 (file)
--- a/extensions/libxt_standard.c
+++ b/extensions/libxt_standard.c
@@ -26,11 +26,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-/* Final check; don't care. */
-static void final_check(unsigned int flags)
-{
-}
-
 /* Saves the targinfo in parsable form to stdout. */
 static void
 save(const void *ip, const struct xt_entry_target *target)
@@ -46,7 +41,6 @@ struct xtables_target standard = {
        .userspacesize  = XT_ALIGN(sizeof(int)),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL,
        .save           = &save,
 };
@@ -60,7 +54,6 @@ struct xtables_target standard6 = {
        .userspacesize  = XT_ALIGN(sizeof(int)),
        .help           = &help,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = NULL,
        .save           = &save,
 };

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index 8c1b82cc233d5a764530d5ea5c56c539ee8bc672..6ab0e2254bbeba5de5c5760428b841f6beb4eed1 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -220,12 +220,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static char *
 port_to_service(int port)
 {
@@ -402,7 +396,6 @@ static struct xtables_match tcp = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,
@@ -417,7 +410,6 @@ static struct xtables_match tcp6 = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts,

diff --git a/extensions/libxt_time.c b/extensions/libxt_time.c
index d380f6358421b317584937df274f5d862fc5043b..a766f11007acf2cb944e99b0067ce61cb6d666b7 100644 (file)
--- a/extensions/libxt_time.c
+++ b/extensions/libxt_time.c
@@ -326,10 +326,6 @@ static int time_parse(int c, char **argv, int invert, unsigned int *flags,
        return 0;
 }
 
-static void time_check(unsigned int flags)
-{
-}
-
 static void time_print_date(time_t date, const char *command)
 {
        struct tm *t;
@@ -476,7 +472,6 @@ static struct xtables_match time_reg = {
        .help          = time_help,
        .init          = time_init,
        .parse         = time_parse,
-       .final_check   = time_check,
        .print         = time_print,
        .save          = time_save,
        .extra_opts    = time_opts,
@@ -491,7 +486,6 @@ static struct xtables_match time6_reg = {
        .help          = time_help,
        .init          = time_init,
        .parse         = time_parse,
-       .final_check   = time_check,
        .print         = time_print,
        .save          = time_save,
        .extra_opts    = time_opts,

diff --git a/extensions/libxt_u32.c b/extensions/libxt_u32.c
index 71b555e9a97dee2158ac41740cbea614219e63a6..2be5c8be2df3c66a1bf273d268ef228f34854255 100644 (file)
--- a/extensions/libxt_u32.c
+++ b/extensions/libxt_u32.c
@@ -247,10 +247,6 @@ static int u32_parse(int c, char **argv, int invert, unsigned int *flags,
        }
 }
 
-static void u32_check(unsigned int flags)
-{
-}
-
 static void u32_print(const void *ip, const struct xt_entry_match *match,
                       int numeric)
 {
@@ -280,7 +276,6 @@ static struct xtables_match u32_reg = {
        .userspacesize = XT_ALIGN(sizeof(struct xt_u32)),
        .help          = u32_help,
        .parse         = u32_parse,
-       .final_check   = u32_check,
        .print         = u32_print,
        .save          = u32_save,
        .extra_opts    = u32_opts,
@@ -294,7 +289,6 @@ static struct xtables_match u32_reg6 = {
        .userspacesize = XT_ALIGN(sizeof(struct xt_u32)),
        .help          = u32_help,
        .parse         = u32_parse,
-       .final_check   = u32_check,
        .print         = u32_print,
        .save          = u32_save,
        .extra_opts    = u32_opts,

diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index 734a0a88d549db4311e53320a07b45fbc5911c9a..d9880cebcb2f396e06b9dc3295d9ea55edaec586 100644 (file)
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -104,12 +104,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
-/* Final check; we don't care. */
-static void
-final_check(unsigned int flags)
-{
-}
-
 static char *
 port_to_service(int port)
 {
@@ -216,7 +210,6 @@ struct xtables_match udp = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts
@@ -232,7 +225,6 @@ struct xtables_match udp6 = {
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
-       .final_check    = &final_check,
        .print          = &print,
        .save           = &save,
        .extra_opts     = opts

diff --git a/ip6tables.c b/ip6tables.c
index 3a54c86f81d5aee98235db0394f23037b0ae2c8d..026a4954394af2c7be93c80c95ad80f1e04a5236 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1840,9 +1840,10 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
        }
 
        for (matchp = matches; matchp; matchp = matchp->next)
-               matchp->match->final_check(matchp->match->mflags);
+               if (matchp->match->final_check != NULL)
+                       matchp->match->final_check(matchp->match->mflags);
 
-       if (target)
+       if (target != NULL && target->final_check != NULL)
                target->final_check(target->tflags);
 
        /* Fix me: must put inverse options checking here --MN */

diff --git a/iptables.c b/iptables.c
index 900e8fc1126e6fe8b5cef782f36cde3732ab04db..d7a45eeb34e855b1652523d24fd4d952885591a6 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1905,9 +1905,10 @@ int do_command(int argc, char *argv[], char **table, iptc_handle_t *handle)
        }
 
        for (matchp = matches; matchp; matchp = matchp->next)
-               matchp->match->final_check(matchp->match->mflags);
+               if (matchp->match->final_check != NULL)
+                       matchp->match->final_check(matchp->match->mflags);
 
-       if (target)
+       if (target != NULL && target->final_check != NULL)
                target->final_check(target->tflags);
 
        /* Fix me: must put inverse options checking here --MN */