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/libxt_CONNMARK.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'extensions/libxt_CONNMARK.c') diff --git a/extensions/libxt_CONNMARK.c b/extensions/libxt_CONNMARK.c index 6aba5f3c..67728775 100644 --- a/extensions/libxt_CONNMARK.c +++ b/extensions/libxt_CONNMARK.c @@ -19,6 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include @@ -49,11 +50,11 @@ static void CONNMARK_help(void) } static const struct option CONNMARK_opts[] = { - { "set-mark", 1, NULL, '1' }, - { "save-mark", 0, NULL, '2' }, - { "restore-mark", 0, NULL, '3' }, - { "mask", 1, NULL, '4' }, - { .name = NULL } + {.name = "set-mark", .has_arg = true, .val = '1'}, + {.name = "save-mark", .has_arg = false, .val = '2'}, + {.name = "restore-mark", .has_arg = false, .val = '3'}, + {.name = "mask", .has_arg = true, .val = '4'}, + XT_GETOPT_TABLEEND, }; static const struct option connmark_tg_opts[] = { @@ -67,7 +68,7 @@ static const struct option connmark_tg_opts[] = { {.name = "ctmask", .has_arg = true, .val = 'c'}, {.name = "nfmask", .has_arg = true, .val = 'n'}, {.name = "mask", .has_arg = true, .val = 'm'}, - {.name = NULL}, + XT_GETOPT_TABLEEND, }; static void connmark_tg_help(void) -- cgit v1.2.3