[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1307711947-586-1-git-send-email-contyk@redhat.com>
Date: Fri, 10 Jun 2011 15:19:07 +0200
From: Petr Sabata <contyk@...hat.com>
To: netdev@...r.kernel.org
Cc: Petr Sabata <contyk@...hat.com>
Subject: [PATCH] iproute2: Remove unreachable code
This patch removes unreachable, useless code.
Signed-off-by: Petr Sabata <contyk@...hat.com>
---
genl/genl.c | 6 ------
tc/f_cgroup.c | 1 -
tc/q_drr.c | 3 +--
tc/q_multiq.c | 3 +--
4 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/genl/genl.c b/genl/genl.c
index 3ae75ae..7ec24eb 100644
--- a/genl/genl.c
+++ b/genl/genl.c
@@ -150,12 +150,6 @@ int main(int argc, char **argv)
ret = a->parse_genlopt(a, argc-1, argv+1);
return ret;
-
- if (matches(argv[1], "help") == 0)
- usage();
- fprintf(stderr, "Object \"%s\" is unknown, try \"genl "
- "-help\".\n", argv[1]);
- exit(-1);
}
usage();
diff --git a/tc/f_cgroup.c b/tc/f_cgroup.c
index 192e697..4a4026e 100644
--- a/tc/f_cgroup.c
+++ b/tc/f_cgroup.c
@@ -74,7 +74,6 @@ static int cgroup_parse_opt(struct filter_util *qu, char *handle,
explain();
return -1;
}
- argc--; argv++;
}
tail->rta_len = (((void*)n)+n->nlmsg_len) - (void*)tail;
diff --git a/tc/q_drr.c b/tc/q_drr.c
index 81de44d..9d3788f 100644
--- a/tc/q_drr.c
+++ b/tc/q_drr.c
@@ -36,7 +36,7 @@ static void explain2(void)
static int drr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
{
- while (argc > 0) {
+ while (argc) {
if (strcmp(*argv, "help") == 0) {
explain();
return -1;
@@ -45,7 +45,6 @@ static int drr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
explain();
return -1;
}
- argc--; argv++;
}
return 0;
}
diff --git a/tc/q_multiq.c b/tc/q_multiq.c
index fce5e44..7ff9e74 100644
--- a/tc/q_multiq.c
+++ b/tc/q_multiq.c
@@ -46,7 +46,7 @@ static int multiq_parse_opt(struct qdisc_util *qu, int argc, char **argv,
{
struct tc_multiq_qopt opt;
- if (argc > 0) {
+ if (argc) {
if (strcmp(*argv, "help") == 0) {
explain();
return -1;
@@ -55,7 +55,6 @@ static int multiq_parse_opt(struct qdisc_util *qu, int argc, char **argv,
explain();
return -1;
}
- argc--; argv++;
}
addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
--
1.7.5.2
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists