matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

m_xt: whitespace cleanup 

Make it 99% checkpatch clean.
This commit is contained in:
Stephen Hemminger 2016-06-14 14:40:53 -07:00
parent 2ef4008585
commit 4b83a08c28
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tc/m_xt.c
View File

@ -39,8 +39,10 @@
#endif #endif
#ifndef __ALIGN_KERNEL #ifndef __ALIGN_KERNEL
#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) #define __ALIGN_KERNEL(x, a) \
#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
#define __ALIGN_KERNEL_MASK(x, mask) \
(((x) + (mask)) & ~(mask))
#endif #endif
#ifndef ALIGN #ifndef ALIGN
@ -51,7 +53,7 @@ static const char *tname = "mangle";
char *lib_dir; char *lib_dir;
static const char *ipthooks[] = { static const char * const ipthooks[] = {
"NF_IP_PRE_ROUTING", "NF_IP_PRE_ROUTING",
"NF_IP_LOCAL_IN", "NF_IP_LOCAL_IN",
"NF_IP_FORWARD", "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 */ /* copy tcipt_globals because .opts will be modified by iptables */
struct xtables_globals tmp_tcipt_globals = tcipt_globals; struct xtables_globals tmp_tcipt_globals = tcipt_globals;
xtables_init_all(&tmp_tcipt_globals, NFPROTO_IPV4); xtables_init_all(&tmp_tcipt_globals, NFPROTO_IPV4);
set_lib_dir(); set_lib_dir();
@ -163,7 +166,8 @@ static int parse_ipt(struct action_util *a, int *argc_p,
} }
if (argc <= 2) { if (argc <= 2) {
fprintf(stderr, "too few arguments for xt, need at least '-j <target>'\n"); fprintf(stderr,
"too few arguments for xt, need at least '-j <target>'\n");
return -1; return -1;
} }
@ -175,7 +179,9 @@ static int parse_ipt(struct action_util *a, int *argc_p,
case 'j': case 'j':
m = xtables_find_target(optarg, XTF_TRY_LOAD); m = xtables_find_target(optarg, XTF_TRY_LOAD);
if (!m) { if (!m) {
fprintf(stderr, " failed to find target %s\n\n", optarg); fprintf(stderr,
" failed to find target %s\n\n",
optarg);
return -1; return -1;
} }
@ -184,8 +190,11 @@ static int parse_ipt(struct action_util *a, int *argc_p,
return -1; return -1;
} }
if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) { if (get_xtables_target_opts(&tmp_tcipt_globals,
fprintf(stderr, " failed to find additional options for target %s\n\n", optarg); m) < 0) {
fprintf(stderr,
" failed to find additional options for target %s\n\n",
optarg);
return -1; return -1;
} }
ok++; ok++;
@ -198,10 +207,11 @@ static int parse_ipt(struct action_util *a, int *argc_p,
#else #else
if (m != NULL && m->parse != NULL) { if (m != NULL && m->parse != NULL) {
m->parse(c - m->option_offset, argv, 0, m->parse(c - m->option_offset, argv, 0,
&m->tflags, NULL, &m->t); &m->tflags, NULL, &m->t);
#endif #endif
} else { } else {
fprintf(stderr, "failed to find target %s\n\n", optarg); fprintf(stderr,
"failed to find target %s\n\n", optarg);
return -1; return -1;
} }
@ -297,7 +307,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
} }
static int 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 xtables_target *m;
struct rtattr *tb[TCA_IPT_MAX + 1]; struct rtattr *tb[TCA_IPT_MAX + 1];
@ -350,7 +360,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) { if (get_xtables_target_opts(&tmp_tcipt_globals, m) < 0) {
fprintf(stderr, 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); t->u.user.name);
return -1; return -1;
} }