From 32b8e61e4e5bd405d9ad07bf9468498dfbb19f9e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 23 Jul 2010 21:16:14 +0200 Subject: all: consistent syntax use in struct option Try to inhibit copypasting old stuff. Signed-off-by: Jan Engelhardt --- extensions/libipt_addrtype.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'extensions/libipt_addrtype.c') diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c index ad63dcf7..9391b4e6 100644 --- a/extensions/libipt_addrtype.c +++ b/extensions/libipt_addrtype.c @@ -1,7 +1,7 @@ /* Shared library add-on to iptables to add addrtype matching support * * This program is released under the terms of GNU GPL */ - +#include #include #include #include @@ -304,23 +304,23 @@ static void addrtype_save_v1(const void *ip, const struct xt_entry_match *match) } static const struct option addrtype_opts[] = { - { "src-type", 1, NULL, '1' }, - { "dst-type", 1, NULL, '2' }, - { .name = NULL } + {.name = "src-type", .has_arg = true, .val = '1'}, + {.name = "dst-type", .has_arg = true, .val = '2'}, + XT_GETOPT_TABLEEND, }; static const struct option addrtype_opts_v0[] = { - { "src-type", 1, NULL, '1' }, - { "dst-type", 1, NULL, '2' }, - { .name = NULL } + {.name = "src-type", .has_arg = true, .val = '1'}, + {.name = "dst-type", .has_arg = true, .val = '2'}, + XT_GETOPT_TABLEEND, }; static const struct option addrtype_opts_v1[] = { - { "src-type", 1, NULL, '1' }, - { "dst-type", 1, NULL, '2' }, - { "limit-iface-in", 0, NULL, '3' }, - { "limit-iface-out", 0, NULL, '4' }, - { .name = NULL } + {.name = "src-type", .has_arg = true, .val = '1'}, + {.name = "dst-type", .has_arg = true, .val = '2'}, + {.name = "limit-iface-in", .has_arg = false, .val = '3'}, + {.name = "limit-iface-out", .has_arg = false, .val = '4'}, + XT_GETOPT_TABLEEND, }; static struct xtables_match addrtype_mt_reg[] = { -- cgit v1.2.3