From: Petr Sabata <contyk@redhat.com>
Date: Fri, 10 Jun 2011 03:19:07 +0000 (+0000)
Subject: iproute2: Remove unreachable code
X-Git-Tag: v3.0.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5582c0cffd5b65def21eca6ef0b7c165cb2f9523;p=thirdparty%2Fiproute2.git

iproute2: Remove unreachable code

This patch removes unreachable, useless code.

Signed-off-by: Petr Sabata <contyk@redhat.com>
---

diff --git a/genl/genl.c b/genl/genl.c
index 3ae75aec7..7ec24eb11 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 192e69764..4a4026ed9 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 81de44d90..9d3788f20 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 fce5e4498..7ff9e74ea 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));