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

tc: m_xt: Get rid of iargc variable in parse_ipt() 

After dropping the unused decrement of argc in the function's tail, it
can fully take over what iargc has been used for.

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

9
tc/m_xt.c
View File

@ -124,7 +124,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
int c; int c;
char **argv = *argv_p; char **argv = *argv_p;
int argc = 0, iargc = 0; int argc = 0;
char k[16]; char k[16];
int size = 0; int size = 0;
int iok = 0, ok = 0; int iok = 0, ok = 0;
@ -144,7 +144,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
break; break;
} }
} }
iargc = argc = i; argc = i;
} }
if (argc <= 2) { if (argc <= 2) {
@ -205,7 +205,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
} }
} }
if (iargc > optind) { if (argc > optind) {
if (matches(argv[optind], "index") == 0) { if (matches(argv[optind], "index") == 0) {
if (get_u32(&index, argv[optind + 1], 10)) { if (get_u32(&index, argv[optind + 1], 10)) {
fprintf(stderr, "Illegal \"index\"\n"); fprintf(stderr, "Illegal \"index\"\n");
@ -271,9 +271,8 @@ static int parse_ipt(struct action_util *a, int *argc_p,
addattr_l(n, MAX_MSG, TCA_IPT_TARG, m->t, m->t->u.target_size); addattr_l(n, MAX_MSG, TCA_IPT_TARG, m->t, m->t->u.target_size);
tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail;
argc -= optind;
argv += optind; argv += optind;
*argc_p -= iargc; *argc_p -= argc;
*argv_p = argv; *argv_p = argv;
optind = 0; optind = 0;