Merge pull request #3869 from qlyoung/cocci-fixes

Assorted Coccinelle fixes

diff --cc bgpd/bgp_aspath.c
Simple merge

diff --cc bgpd/bgp_attr.c
Simple merge

diff --cc bgpd/bgp_attr_evpn.c
Simple merge

diff --cc bgpd/bgp_community.c
Simple merge

diff --cc bgpd/bgp_ecommunity.c
Simple merge

diff --cc bgpd/bgp_evpn.c
Simple merge

diff --cc bgpd/bgp_lcommunity.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/rfapi/rfapi_import.c
Simple merge

diff --cc lib/if_rmap.c
index 53bbcbfe57b6548b542444031303779a0ab0263e,f8e500f43d514b014651a5d41b1919dc903ebca2..955c1417c4f47680480c04862e7e4572c1347cfb
--- 1/lib/if_rmap.c
--- 2/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@@ -63,10 -62,9 +60,9 @@@ struct if_rmap *if_rmap_lookup(struct i
        /* temporary copy */
        key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
  
 -      if_rmap = hash_lookup(ifrmaphash, &key);
 +      if_rmap = hash_lookup(ctx->ifrmaphash, &key);
  
-       if (key.ifname)
-               XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+       XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
  
        return if_rmap;
  }
@@@ -104,10 -98,9 +100,9 @@@ static struct if_rmap *if_rmap_get(stru
        /* temporary copy */
        key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
  
 -      ret = hash_get(ifrmaphash, &key, if_rmap_hash_alloc);
 +      ret = hash_get(ctx->ifrmaphash, &key, if_rmap_hash_alloc);
  
-       if (key.ifname)
-               XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+       XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
  
        return ret;
  }
@@@ -133,12 -125,10 +128,10 @@@ static struct if_rmap *if_rmap_set(stru
  {
        struct if_rmap *if_rmap;
  
 -      if_rmap = if_rmap_get(ifname);
 +      if_rmap = if_rmap_get(ctx, ifname);
  
        if (type == IF_RMAP_IN) {
-               if (if_rmap->routemap[IF_RMAP_IN])
-                       XFREE(MTYPE_IF_RMAP_NAME,
-                             if_rmap->routemap[IF_RMAP_IN]);
+               XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
                if_rmap->routemap[IF_RMAP_IN] =
                        XSTRDUP(MTYPE_IF_RMAP_NAME, routemap_name);
        }

diff --cc lib/prefix.c
Simple merge

diff --cc zebra/if_netlink.c
Simple merge

diff --cc zebra/zebra_rib.c
Simple merge

diff --cc zebra/zebra_vxlan.c
Simple merge