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

tc: fix return after invarg

This commit is contained in:
Stephen Hemminger 2015-08-13 14:20:40 -07:00
parent 6a9ce30e78
commit bcb4a7aa5b
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tc/tc_stab.c
View File

@ -67,42 +67,32 @@ int parse_size_table(int *argcp, char ***argvp, struct tc_sizespec *sp)
NEXT_ARG(); NEXT_ARG();
if (s.mtu) if (s.mtu)
duparg("mtu", *argv); duparg("mtu", *argv);
if (get_u32(&s.mtu, *argv, 10)) { if (get_u32(&s.mtu, *argv, 10))
invarg("mtu", "invalid mtu"); invarg("mtu", "invalid mtu");
return -1;
}
} else if (matches(*argv, "mpu") == 0) { } else if (matches(*argv, "mpu") == 0) {
NEXT_ARG(); NEXT_ARG();
if (s.mpu) if (s.mpu)
duparg("mpu", *argv); duparg("mpu", *argv);
if (get_u32(&s.mpu, *argv, 10)) { if (get_u32(&s.mpu, *argv, 10))
invarg("mpu", "invalid mpu"); invarg("mpu", "invalid mpu");
return -1;
}
} else if (matches(*argv, "overhead") == 0) { } else if (matches(*argv, "overhead") == 0) {
NEXT_ARG(); NEXT_ARG();
if (s.overhead) if (s.overhead)
duparg("overhead", *argv); duparg("overhead", *argv);
if (get_integer(&s.overhead, *argv, 10)) { if (get_integer(&s.overhead, *argv, 10))
invarg("overhead", "invalid overhead"); invarg("overhead", "invalid overhead");
return -1;
}
} else if (matches(*argv, "tsize") == 0) { } else if (matches(*argv, "tsize") == 0) {
NEXT_ARG(); NEXT_ARG();
if (s.tsize) if (s.tsize)
duparg("tsize", *argv); duparg("tsize", *argv);
if (get_u32(&s.tsize, *argv, 10)) { if (get_u32(&s.tsize, *argv, 10))
invarg("tsize", "invalid table size"); invarg("tsize", "invalid table size");
return -1;
}
} else if (matches(*argv, "linklayer") == 0) { } else if (matches(*argv, "linklayer") == 0) {
NEXT_ARG(); NEXT_ARG();
if (s.linklayer != LINKLAYER_UNSPEC) if (s.linklayer != LINKLAYER_UNSPEC)
duparg("linklayer", *argv); duparg("linklayer", *argv);
if (get_linklayer(&s.linklayer, *argv)) { if (get_linklayer(&s.linklayer, *argv))
invarg("linklayer", "invalid linklayer"); invarg("linklayer", "invalid linklayer");
return -1;
}
} else } else
break; break;
argc--; argv++; argc--; argv++;