From 0401b1f92170a3c503e6dd1430b9b7cc0bcdbe47 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 4 Apr 2017 16:24:00 +0200 Subject: [PATCH] m_xt: whitespace cleanup Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1326726 Upstream Status: iproute2.git commit 4b83a08c280fc Conflicts: Changes in replaced code due to missing upstream commit 32a121cba2579 ("tc: code cleanup"). commit 4b83a08c280fcd14ed8e775adc7604ea13c1252f Author: Stephen Hemminger Date: Tue Jun 14 14:40:53 2016 -0700 m_xt: whitespace cleanup Make it 99% checkpatch clean. --- tc/m_xt.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/tc/m_xt.c b/tc/m_xt.c index c96d58c..8317f31 100644 --- a/tc/m_xt.c +++ b/tc/m_xt.c @@ -39,8 +39,10 @@ #endif #ifndef __ALIGN_KERNEL -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) +#define __ALIGN_KERNEL(x, a) \ + __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) \ + (((x) + (mask)) & ~(mask)) #endif #ifndef ALIGN @@ -51,7 +53,7 @@ static const char *tname = "mangle"; char *lib_dir; -static const char *ipthooks[] = { +static const char * const ipthooks[] = { "NF_IP_PRE_ROUTING", "NF_IP_LOCAL_IN", "NF_IP_FORWARD", @@ -153,6 +155,7 @@ static int parse_ipt(struct action_util *a, int *argc_p, /* copy tcipt_globals because .opts will be modified by iptables */ struct xtables_globals tmp_tcipt_globals = tcipt_globals; + xtables_init_all(&tmp_tcipt_globals, NFPROTO_IPV4); set_lib_dir(); @@ -163,7 +166,8 @@ static int parse_ipt(struct action_util *a, int *argc_p, } if (argc <= 2) { - fprintf(stderr, "too few arguments for xt, need at least '-j '\n"); + fprintf(stderr, + "too few arguments for xt, need at least '-j '\n"); return -1; } @@ -175,7 +179,9 @@ static int parse_ipt(struct action_util *a, int *argc_p, case 'j': m = xtables_find_target(optarg, XTF_TRY_LOAD); if (!m) { - fprintf(stderr, " failed to find target %s\n\n", optarg); + fprintf(stderr, + " failed to find target %s\n\n", + optarg); return -1; } @@ -184,8 +190,11 @@ static int parse_ipt(struct action_util *a, int *argc_p, return -1; } - if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) { - fprintf(stderr, " failed to find additional options for target %s\n\n", optarg); + if (get_xtables_target_opts(&tmp_tcipt_globals, + m) < 0) { + fprintf(stderr, + " failed to find additional options for target %s\n\n", + optarg); return -1; } ok++; @@ -198,10 +207,11 @@ static int parse_ipt(struct action_util *a, int *argc_p, #else if (m != NULL && m->parse != NULL) { m->parse(c - m->option_offset, argv, 0, - &m->tflags, NULL, &m->t); + &m->tflags, NULL, &m->t); #endif } else { - fprintf(stderr,"failed to find target %s\n\n", optarg); + fprintf(stderr, + "failed to find target %s\n\n", optarg); return -1; } @@ -296,7 +306,7 @@ static int parse_ipt(struct action_util *a, int *argc_p, } static int -print_ipt(struct action_util *au,FILE * f, struct rtattr *arg) +print_ipt(struct action_util *au, FILE *f, struct rtattr *arg) { struct xtables_target *m; struct rtattr *tb[TCA_IPT_MAX + 1]; @@ -348,7 +358,7 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg) if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) { fprintf(stderr, - " failed to find additional options for target %s\n\n", + " failed to find additional options for target %s\n\n", t->u.user.name); return -1; } -- 1.8.3.1