proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-06 18:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: m_xt: Fix indenting

Browse Source 
By exiting early if xtables_find_target() fails, one indenting level can
be dropped. Some of the wrongly indented code then happens to sit at the
right spot by accident which is why this patch is smaller than expected.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2016-06-10 13:42:02 +02:00 committed by Stephen Hemminger
parent 8eee75a835
commit f1a7c7d830
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tc/m_xt.c
View File

@ -161,12 +161,15 @@ static int parse_ipt(struct action_util *a, int *argc_p,
switch (c) { switch (c) {
case 'j': case 'j':
m = xtables_find_target(optarg, XTF_TRY_LOAD); m = xtables_find_target(optarg, XTF_TRY_LOAD);
if (m != NULL) { if (!m) {
fprintf(stderr, " failed to find target %s\n\n", optarg);
return -1;
}
if (build_st(m, NULL) < 0) { if (build_st(m, NULL) < 0) {
printf(" %s error\n", m->name); printf(" %s error\n", m->name);
return -1; return -1;
} }
#if (XTABLES_VERSION_CODE >= 6) #if (XTABLES_VERSION_CODE >= 6)
opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts, opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts,
tmp_tcipt_globals.opts, tmp_tcipt_globals.opts,
@ -182,22 +185,18 @@ static int parse_ipt(struct action_util *a, int *argc_p,
return -1; return -1;
} else } else
tmp_tcipt_globals.opts = opts; tmp_tcipt_globals.opts = opts;
} else {
fprintf(stderr, " failed to find target %s\n\n", optarg);
return -1;
}
ok++; ok++;
break; break;
default: default:
memset(&fw, 0, sizeof(fw)); memset(&fw, 0, sizeof(fw));
#if (XTABLES_VERSION_CODE >= 6) #if (XTABLES_VERSION_CODE >= 6)
if (m != NULL && m->x6_parse != NULL) { if (m != NULL && m->x6_parse != NULL) {
xtables_option_tpcall(c, argv, 0, m, NULL); xtables_option_tpcall(c, argv, 0, m, NULL);
#else #else
if (m != NULL && m->parse != NULL) { if (m != NULL && m->parse != NULL) {
m->parse(c - m->option_offset, argv, 0, &m->tflags, m->parse(c - m->option_offset, argv, 0,
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);
@ -339,11 +338,15 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
t = RTA_DATA(tb[TCA_IPT_TARG]); t = RTA_DATA(tb[TCA_IPT_TARG]);
m = xtables_find_target(t->u.user.name, XTF_TRY_LOAD); m = xtables_find_target(t->u.user.name, XTF_TRY_LOAD);
if (m != NULL) { if (!m) {
if (build_st(m, t) < 0) { fprintf(stderr, " failed to find target %s\n\n",
fprintf(stderr, " %s error\n", m->name); t->u.user.name);
return -1; return -1;
} }
if (build_st(m, t) < 0) {
fprintf(stderr, " %s error\n", m->name);
return -1;
}
#if (XTABLES_VERSION_CODE >= 6) #if (XTABLES_VERSION_CODE >= 6)
opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts, opts = xtables_options_xfrm(tmp_tcipt_globals.orig_opts,
@ -355,16 +358,11 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg)
m->extra_opts, m->extra_opts,
&m->option_offset); &m->option_offset);
#endif #endif
if (opts == NULL) { if (opts == NULL) {
fprintf(stderr, " failed to find additional options for target %s\n\n", optarg); fprintf(stderr, " failed to find additional options for target %s\n\n", optarg);
return -1;
} else
tmp_tcipt_globals.opts = opts;
} else {
fprintf(stderr, " failed to find target %s\n\n",
t->u.user.name);
return -1; return -1;
} } else
tmp_tcipt_globals.opts = opts;
fprintf(f, "\ttarget "); fprintf(f, "\ttarget ");
m->print(NULL, m->t, 0); m->print(NULL, m->t, 0);
if (tb[TCA_IPT_INDEX] == NULL) { if (tb[TCA_IPT_INDEX] == NULL) {