eigrpd lib pimd zebra: dead code (PVS-Studio)

Signed-off-by: F. Aragon <paco@voltanet.io>

diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
index fab21e52019b6d9cda10e61dd1236849ff691b92..129b5aedde5ff0f08ea94fb0c34645e72aaa62f8 100644 (file)
--- a/eigrpd/eigrp_packet.c
+++ b/eigrpd/eigrp_packet.c
@@ -566,7 +566,7 @@ int eigrp_read(struct thread *thread)
        //    return -1;
 
        /* If incoming interface is passive one, ignore it. */
-       if (ei && eigrp_if_is_passive(ei)) {
+       if (eigrp_if_is_passive(ei)) {
                char buf[3][INET_ADDRSTRLEN];
 
                if (IS_DEBUG_EIGRP_TRANSMIT(0, RECV))

diff --git a/lib/filter.c b/lib/filter.c
index 5f391aa7670435486d46e773b1ad96ac8de70b19..670c65374a0fbc1fefd3afef7cbc9a6d679a89ec 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -549,8 +549,7 @@ static int vty_access_list_remark_unset(struct vty *vty, afi_t afi,
                access->remark = NULL;
        }
 
-       if (access->head == NULL && access->tail == NULL
-           && access->remark == NULL)
+       if (access->head == NULL && access->tail == NULL)
                access_list_delete(access);
 
        return CMD_SUCCESS;

diff --git a/lib/module.c b/lib/module.c
index 0c853640035a9c34d7aca1e1056e597513b51bc3..7d5671290bc75c28e056d4bde0bacb5eea476c9e 100644 (file)
--- a/lib/module.c
+++ b/lib/module.c
@@ -85,7 +85,7 @@ struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
                *args++ = '\0';
 
        if (!strchr(name, '/')) {
-               if (!handle && execname) {
+               if (execname) {
                        snprintf(fullpath, sizeof(fullpath), "%s/%s_%s.so", dir,
                                 execname, name);
                        handle = dlopen(fullpath, RTLD_NOW | RTLD_GLOBAL);

diff --git a/lib/vrf.c b/lib/vrf.c
index 643ad29cf865782d0e4a0f12c57248f8bcdc87c8..ca50c1e70e8578f7d09b9047ca54598b4d0b4903 100644 (file)
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -628,7 +628,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
        }
        if (vrf->ns_ctxt != NULL) {
                ns = (struct ns *)vrf->ns_ctxt;
-               if (ns && 0 != strcmp(ns->name, pathname)) {
+               if (!strcmp(ns->name, pathname)) {
                        if (vty)
                                vty_out(vty,
                                        "VRF %u already configured with NETNS %s\n",
@@ -661,8 +661,7 @@ int vrf_netns_handler_create(struct vty *vty, struct vrf *vrf, char *pathname,
        ns->vrf_ctxt = (void *)vrf;
        vrf->ns_ctxt = (void *)ns;
        /* update VRF netns NAME */
-       if (vrf)
-               strlcpy(vrf->data.l.netns_name, basename(pathname), NS_NAMSIZ);
+       strlcpy(vrf->data.l.netns_name, basename(pathname), NS_NAMSIZ);
 
        if (!ns_enable(ns, vrf_update_vrf_id)) {
                if (vty)

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 5e6b0f10cf5e47a048bbca58aca0c09cabe47820..6c347a430ff3cd6634504cca7825c03b8e05634d 100644 (file)
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -136,9 +136,8 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
                        mask = PIM_OIF_FLAG_PROTO_IGMP;
 
                /* SGRpt entry could have empty oil */
-               if (ch->upstream->channel_oil)
-                       pim_channel_del_oif(ch->upstream->channel_oil,
-                                           ch->interface, mask);
+               pim_channel_del_oif(ch->upstream->channel_oil, ch->interface,
+                                   mask);
                /*
                 * Do we have any S,G's that are inheriting?
                 * Nuke from on high too.

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index c980f5fcbaa718187ca1682201b8b4314423c9ba..92993ff1b968838d52f39170c0523ca004bc9112 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -919,10 +919,9 @@ static int pim_igmp_read(struct thread *t)
        socklen_t fromlen = sizeof(from);
        socklen_t tolen = sizeof(to);
        ifindex_t ifindex = -1;
-       int cont = 1;
        int len;
 
-       while (cont) {
+       while (1) {
                len = pim_socket_recvfromto(igmp->fd, buf, sizeof(buf), &from,
                                            &fromlen, &to, &tolen, &ifindex);
                if (len < 0) {

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index fa6486a83e76312b406e2f9626809d85aa4044b8..d0fa90f0db71b583083c378064c171f9e8efee11 100644 (file)
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -168,7 +168,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, struct prefix *addr,
        if (up != NULL)
                hash_get(pnc->upstream_hash, up, hash_alloc_intern);
 
-       if (pnc && CHECK_FLAG(pnc->flags, PIM_NEXTHOP_VALID)) {
+       if (CHECK_FLAG(pnc->flags, PIM_NEXTHOP_VALID)) {
                memcpy(out_pnc, pnc, sizeof(struct pim_nexthop_cache));
                return 1;
        }

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 5c84219418422842abf7cad504a8da98aa8408dd..8f6e31cfa8864a32c7ef868c4b9f9eddd026398f 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -986,7 +986,7 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        if (tb[IFA_LABEL])
                label = (char *)RTA_DATA(tb[IFA_LABEL]);
 
-       if (ifp && label && strcmp(ifp->name, label) == 0)
+       if (label && strcmp(ifp->name, label) == 0)
                label = NULL;
 
        /* Register interface address to the interface. */

diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index 8c23bf34cf1670c080003fafe9dc4ece86d73fb9..5975c4058b99b2454b5b624fbb1486f211de5edf 100644 (file)
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -615,7 +615,7 @@ static int zebra_ptm_handle_msg_cb(void *arg, void *in_ctxt)
 
 int zebra_ptm_sock_read(struct thread *thread)
 {
-       int sock, done = 0;
+       int sock;
        int rc;
 
        errno = 0;
@@ -625,28 +625,24 @@ int zebra_ptm_sock_read(struct thread *thread)
                return -1;
 
        /* PTM communicates in CSV format */
-       while (!done) {
+       do {
                rc = ptm_lib_process_msg(ptm_hdl, sock, ptm_cb.in_data,
                                         ZEBRA_PTM_MAX_SOCKBUF, NULL);
-               if (rc <= 0)
-                       break;
-       }
+       } while (rc > 0);
 
-       if (rc <= 0) {
-               if (((rc == 0) && !errno)
-                   || (errno && (errno != EWOULDBLOCK) && (errno != EAGAIN))) {
-                       zlog_warn("%s routing socket error: %s(%d) bytes %d",
-                                 __func__, safe_strerror(errno), errno, rc);
-
-                       close(ptm_cb.ptm_sock);
-                       ptm_cb.ptm_sock = -1;
-                       zebra_ptm_reset_status(0);
-                       ptm_cb.t_timer = NULL;
-                       thread_add_timer(zebrad.master, zebra_ptm_connect, NULL,
-                                        ptm_cb.reconnect_time,
-                                        &ptm_cb.t_timer);
-                       return (-1);
-               }
+       if (((rc == 0) && !errno)
+           || (errno && (errno != EWOULDBLOCK) && (errno != EAGAIN))) {
+               zlog_warn("%s routing socket error: %s(%d) bytes %d",
+                         __func__, safe_strerror(errno), errno, rc);
+
+               close(ptm_cb.ptm_sock);
+               ptm_cb.ptm_sock = -1;
+               zebra_ptm_reset_status(0);
+               ptm_cb.t_timer = NULL;
+               thread_add_timer(zebrad.master, zebra_ptm_connect, NULL,
+                                ptm_cb.reconnect_time,
+                                &ptm_cb.t_timer);
+               return (-1);
        }
 
        ptm_cb.t_read = NULL;