bgpd isisd ldpd lib ospfd pimd: redundancy (infer)

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

diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c
index 69c92e829c59ce6174a792ee08df89470cd6e6b6..c8d5b1daa121a3ed51817f242e0dc53fde9fc21e 100644 (file)
--- a/bgpd/bgp_io.c
+++ b/bgpd/bgp_io.c
@@ -174,7 +174,6 @@ static int bgp_process_reads(struct thread *thread)
        bool more = true;               // whether we got more data
        bool fatal = false;             // whether fatal error occurred
        bool added_pkt = false;         // whether we pushed onto ->ibuf
-       bool header_valid = true;       // whether header is valid
        /* clang-format on */
 
        peer = THREAD_ARG(thread);
@@ -214,10 +213,8 @@ static int bgp_process_reads(struct thread *thread)
                if (ringbuf_remain(ibw) < BGP_HEADER_SIZE)
                        break;
 
-               /* validate header */
-               header_valid = validate_header(peer);
-
-               if (!header_valid) {
+               /* check that header is valid */
+               if (!validate_header(peer)) {
                        fatal = true;
                        break;
                }

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index fd8d894878a55aa277a2cfbf177bcba85efbd2a9..32011d210ba29f02e3806e7ec9ddd3c5e3da7f9a 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -438,7 +438,7 @@ int bgp_subgrp_multiaccess_check_v4(struct in_addr nexthop,
        struct bgp_node *rn1, *rn2;
        struct peer_af *paf;
        struct prefix p, np;
-       struct bgp *bgp = NULL;
+       struct bgp *bgp;
 
        np.family = AF_INET;
        np.prefixlen = IPV4_MAX_BITLEN;
@@ -447,7 +447,7 @@ int bgp_subgrp_multiaccess_check_v4(struct in_addr nexthop,
        p.family = AF_INET;
        p.prefixlen = IPV4_MAX_BITLEN;
 
-       rn1 = rn2 = NULL;
+       rn2 = NULL;
 
        bgp = SUBGRP_INST(subgrp);
        rn1 = bgp_node_match(bgp->connected_table[AFI_IP], &np);

diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index cabd5b5cbd795027ae9a4797a2b2e17abce90d4f..34ddbfcd14171db41b90934ff5acf73dddee0aa8 100644 (file)
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -397,7 +397,7 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt,
        vec = &pkt->arr.entries[BGP_ATTR_VEC_NH];
        if (CHECK_FLAG(vec->flags, BPKT_ATTRVEC_FLAGS_UPDATED)) {
                uint8_t nhlen;
-               afi_t nhafi = AFI_MAX; /* NH AFI is based on nhlen! */
+               afi_t nhafi;
                int route_map_sets_nh;
                nhlen = stream_getc_from(s, vec->offset);
                if (peer_cap_enhe(peer, paf->afi, paf->safi))

diff --git a/bgpd/bgp_vpn.c b/bgpd/bgp_vpn.c
index 351f91dd1a046ef45810a7d75e8d854b97a46305..b1e8d9a4777c0a83026fa5af322acd8dd1e892fa 100644 (file)
--- a/bgpd/bgp_vpn.c
+++ b/bgpd/bgp_vpn.c
@@ -125,7 +125,7 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
 
                                        if (rd_header) {
                                                uint16_t type;
-                                               struct rd_as rd_as;
+                                               struct rd_as rd_as = {0};
                                                struct rd_ip rd_ip = {0};
 #if ENABLE_BGP_VNC
                                                struct rd_vnc_eth rd_vnc_eth = {

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index f0fc3a89e9ff654ee2128962ff7703e0e4c2e2f3..bfb6ecf94c3c545f76c01f0acd081b2a9c67e039 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -11408,7 +11408,6 @@ DEFUN (show_ip_bgp_peer_groups,
        "Peer group name\n")
 {
        char *vrf, *pg;
-       vrf = pg = NULL;
        int idx = 0;
 
        vrf = argv_find(argv, argc, "VIEWVRFNAME", &idx) ? argv[idx]->arg

diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index 6834f52a82a63c2bbab54ac4b332a753e6451c8c..8e53df3b61fe5dfb8c46e172772f9110a45c3af7 100644 (file)
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -884,7 +884,7 @@ static uint8_t print_subtlv_use_bw(struct sbuf *buf, int indent,
 static uint8_t print_unknown_tlv(struct sbuf *buf, int indent,
                                 struct subtlv_header *tlvh)
 {
-       int i, rtn = 1;
+       int i, rtn;
        uint8_t *v = (uint8_t *)tlvh;
 
        if (tlvh->length != 0) {

diff --git a/isisd/isisd.c b/isisd/isisd.c
index 6f04d72082bc589c3a2afe7bd0eaf4c0735d016e..cecaa0693dba709ee8212a699230edc0ffdbbf1c 100644 (file)
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1373,7 +1373,7 @@ static int show_isis_database(struct vty *vty, const char *argv, int ui_level)
        struct isis_area *area;
        struct isis_lsp *lsp;
        struct isis_dynhn *dynhn;
-       const char *pos = argv;
+       const char *pos;
        uint8_t lspid[ISIS_SYS_ID_LEN + 2];
        char sysid[255];
        uint8_t number[3];

diff --git a/lib/imsg.c b/lib/imsg.c
index 6419f805abb57c6ed2f568d4ccf05e1dfe29cff1..54241407205d203f0ae3964e784afbf27bc03e7d 100644 (file)
--- a/lib/imsg.c
+++ b/lib/imsg.c
@@ -77,7 +77,7 @@ ssize_t imsg_read(struct imsgbuf *ibuf)
                char buf[CMSG_SPACE(sizeof(int) * 1)];
        } cmsgbuf;
        struct iovec iov;
-       ssize_t n = -1;
+       ssize_t n;
        int fd;
        struct imsg_fd *ifd;
 
@@ -110,7 +110,8 @@ again:
                return (-1);
        }
 
-       if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
+       n = recvmsg(ibuf->fd, &msg, 0);
+       if (n == -1) {
                if (errno == EINTR)
                        goto again;
                goto fail;

diff --git a/lib/sockopt.c b/lib/sockopt.c
index 1d8d9990df5d812cd4a2014ac33991ae84280350..815be86c2e152eec3f943f4d87007ca25363e8a2 100644 (file)
--- a/lib/sockopt.c
+++ b/lib/sockopt.c
@@ -457,8 +457,7 @@ int setsockopt_ifindex(int af, int sock, ifindex_t val)
  */
 static ifindex_t getsockopt_ipv4_ifindex(struct msghdr *msgh)
 {
-       /* XXX: initialize to zero?  (Always overwritten, so just cosmetic.) */
-       ifindex_t ifindex = -1;
+       ifindex_t ifindex;
 
 #if defined(IP_PKTINFO)
        /* Linux pktinfo based ifindex retrieval */
@@ -466,7 +465,11 @@ static ifindex_t getsockopt_ipv4_ifindex(struct msghdr *msgh)
 
        pktinfo = (struct in_pktinfo *)getsockopt_cmsg_data(msgh, IPPROTO_IP,
                                                            IP_PKTINFO);
-       /* XXX Can pktinfo be NULL?  Clean up post 0.98. */
+
+       /* getsockopt_ifindex() will forward this, being 0 "not found" */
+       if (pktinfo == NULL)
+               return 0;
+
        ifindex = pktinfo->ipi_ifindex;
 
 #elif defined(IP_RECVIF)

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 31cffea7f2350be03bd6233a409073da3d3bb380..7d748419faceb8ae6fe6ee2f37d58c3b4d54a264 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2412,8 +2412,8 @@ DEFUN (ospf_neighbor_poll_interval,
        int idx_poll = 3;
        int idx_pri = 5;
        struct in_addr nbr_addr;
-       unsigned int priority = OSPF_NEIGHBOR_PRIORITY_DEFAULT;
-       unsigned int interval = OSPF_POLL_INTERVAL_DEFAULT;
+       unsigned int priority;
+       unsigned int interval;
 
        if (!inet_aton(argv[idx_ipv4]->arg, &nbr_addr)) {
                vty_out(vty, "Please specify Neighbor ID by A.B.C.D\n");
@@ -2422,8 +2422,8 @@ DEFUN (ospf_neighbor_poll_interval,
 
        interval = strtoul(argv[idx_poll]->arg, NULL, 10);
 
-       if (argc > 4)
-               priority = strtoul(argv[idx_pri]->arg, NULL, 10);
+       priority = argc > 4 ? strtoul(argv[idx_pri]->arg, NULL, 10)
+                           : OSPF_NEIGHBOR_PRIORITY_DEFAULT;
 
        ospf_nbr_nbma_set(ospf, nbr_addr);
        ospf_nbr_nbma_poll_interval_set(ospf, nbr_addr, interval);

diff --git a/pimd/mtracebis.c b/pimd/mtracebis.c
index 731fdb1beb5c5e71f9d382820e30439549a41c0d..c63a6eeca983fa8fbe1b31d3c9fb9060b7d921b2 100644 (file)
--- a/pimd/mtracebis.c
+++ b/pimd/mtracebis.c
@@ -336,7 +336,7 @@ static int wait_for_response(int fd, int *hops, struct igmp_mtrace *mtrace,
 {
        fd_set readfds;
        struct timeval timeout;
-       int ret = -1;
+       int ret;
        long msec, rmsec, tmsec;
 
        FD_ZERO(&readfds);

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 55222ecddbd81ab973ca2702eefdc6a77fbc570e..123c47568cb0a5b6ec61b4c6cb7a05a877901f37 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -4504,8 +4504,8 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
        json_object *json_source = NULL;
        json_object *json_oil = NULL;
        json_object *json_ifp_out = NULL;
-       int found_oif = 0;
-       int first = 1;
+       int found_oif;
+       int first;
        char grp_str[INET_ADDRSTRLEN];
        char src_str[INET_ADDRSTRLEN];
        char in_ifname[INTERFACE_NAMSIZ + 1];

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index de09b070f467a3f2d4cf45fc3e9b8270dd9ead46..f506875282d3cb65f9d797b06e3f55b2f00bb474 100644 (file)
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -521,7 +521,7 @@ int pim_msg_send(int fd, struct in_addr src, struct in_addr dst,
        socklen_t tolen;
        unsigned char buffer[10000];
        unsigned char *msg_start;
-       uint8_t ttl = MAXTTL;
+       uint8_t ttl;
        struct pim_msg_header *header;
        struct ip *ip;