]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
iproute2: Remove unreachable code
authorPetr Sabata <contyk@redhat.com>
Fri, 10 Jun 2011 03:19:07 +0000 (03:19 +0000)
committerStephen Hemminger <shemminger@vyatta.com>
Mon, 11 Jul 2011 17:13:51 +0000 (10:13 -0700)
This patch removes unreachable, useless code.

Signed-off-by: Petr Sabata <contyk@redhat.com>
genl/genl.c
tc/f_cgroup.c
tc/q_drr.c
tc/q_multiq.c

index 3ae75aec72576890f328dfd05deb535e119c6aa7..7ec24eb11482153721aee772903764aa7576fa0a 100644 (file)
@@ -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();
index 192e69764b7d0856351fe95cedb3092d7e13774b..4a4026ed9ad7a89a024697205a0fed61f148a689 100644 (file)
@@ -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;
index 81de44d909a53c2223ba9d80d041fa11209669c4..9d3788f2083c31743c05ebcab91b042cf97937d1 100644 (file)
@@ -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;
 }
index fce5e449862b1e3318660111994e7057ef6a577d..7ff9e74ea33d545bf673de05619546905b3b5cf6 100644 (file)
@@ -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));