Merge pull request #3119 from pacovn/Coverity_1465497_dead_code

zebra: dead code (Coverity 1465497)
This commit is contained in:
Jafar Al-Gharaibeh 2018-10-06 00:18:52 -05:00 committed by GitHub
commit 41df11abc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -220,21 +220,16 @@ ns_id_t zebra_ns_id_get(const char *netnspath)
nlh = (struct nlmsghdr *)buf; nlh = (struct nlmsghdr *)buf;
/* message to analyse : NEWNSID response */ /* message to analyse : NEWNSID response */
len = ret;
ret = 0; ret = 0;
do {
if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) { if (nlh->nlmsg_type >= NLMSG_MIN_TYPE) {
return_nsid = extract_nsid(nlh, buf); return_nsid = extract_nsid(nlh, buf);
if (return_nsid != NS_UNKNOWN)
break;
} else { } else {
if (nlh->nlmsg_type == NLMSG_ERROR) { if (nlh->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = struct nlmsgerr *err =
(struct nlmsgerr (struct nlmsgerr
*)((char *)nlh *)((char *)nlh
+ NETLINK_ALIGN(sizeof( + NETLINK_ALIGN(
struct sizeof(struct nlmsghdr)));
nlmsghdr)));
ret = -1; ret = -1;
if (err->error < 0) if (err->error < 0)
@ -253,13 +248,8 @@ ns_id_t zebra_ns_id_get(const char *netnspath)
*/ */
ret = -1; ret = -1;
errno = EEXIST; errno = EEXIST;
break;
} }
} }
len = len - NETLINK_ALIGN(nlh->nlmsg_len);
nlh = (struct nlmsghdr *)((char *)nlh
+ NETLINK_ALIGN(nlh->nlmsg_len));
} while (len != 0 && return_nsid != NS_UNKNOWN && ret == 0);
if (ret <= 0) { if (ret <= 0) {
if (errno != EEXIST && ret != 0) { if (errno != EEXIST && ret != 0) {