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

tc/m_gact: Drop dead code 

The use of 'ok' variable in parse_gact() is ineffective: The second
conditional increments it either if *argv is 'gact' or if
parse_action_control() doesn't fail (in which case exit() is called).
So this is effectively an unconditional increment and since no decrement
happens anywhere, all remaining checks for 'ok != 0' can be dropped.

Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2017-08-17 19:09:31 +02:00 committed by Stephen Hemminger
parent e469523e8e
commit 73aa988868
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tc/m_gact.c
View File

@ -76,7 +76,6 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
{ {
int argc = *argc_p; int argc = *argc_p;
char **argv = *argv_p; char **argv = *argv_p;
int ok = 0;
struct tc_gact p = { 0 }; struct tc_gact p = { 0 };
#ifdef CONFIG_GACT_PROB #ifdef CONFIG_GACT_PROB
int rd = 0; int rd = 0;
@ -89,17 +88,14 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
if (matches(*argv, "gact") == 0) { if (matches(*argv, "gact") == 0) {
ok++;
argc--; argc--;
argv++; argv++;
} else { } else if (parse_action_control(&argc, &argv, &p.action, false) == -1) {
if (parse_action_control(&argc, &argv, &p.action, false) == -1) usage(); /* does not return */
usage();
ok++;
} }
#ifdef CONFIG_GACT_PROB #ifdef CONFIG_GACT_PROB
if (ok && argc > 0) { if (argc > 0) {
if (matches(*argv, "random") == 0) { if (matches(*argv, "random") == 0) {
rd = 1; rd = 1;
NEXT_ARG(); NEXT_ARG();
@ -142,15 +138,11 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
} }
argc--; argc--;
argv++; argv++;
ok++;
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
usage(); usage();
} }
} }
if (!ok)
return -1;
tail = NLMSG_TAIL(n); tail = NLMSG_TAIL(n);
addattr_l(n, MAX_MSG, tca_id, NULL, 0); addattr_l(n, MAX_MSG, tca_id, NULL, 0);
addattr_l(n, MAX_MSG, TCA_GACT_PARMS, &p, sizeof(p)); addattr_l(n, MAX_MSG, TCA_GACT_PARMS, &p, sizeof(p));