eigrpd: clean up variable-shadow warnings

Clean up various warnings from -Wshadow in eigrp.

Signed-off-by: Mark Stapp <mjs@cisco.com>

diff --git a/eigrpd/eigrp_northbound.c b/eigrpd/eigrp_northbound.c
index 90af47e9e2524b4cd506744aa100ad57c7d7555d..de6da954cf7246286bbee8c5e250c384f44692cd 100644 (file)
--- a/eigrpd/eigrp_northbound.c
+++ b/eigrpd/eigrp_northbound.c
@@ -739,7 +739,7 @@ static int eigrpd_instance_redistribute_create(struct nb_cb_create_args *args)
                else
                        vrfid = VRF_DEFAULT;
 
-               if (vrf_bitmap_check(&zclient->redist[AFI_IP][proto], vrfid))
+               if (vrf_bitmap_check(&eigrp_zclient->redist[AFI_IP][proto], vrfid))
                        return NB_ERR_INCONSISTENCY;
                break;
        case NB_EV_PREPARE:

diff --git a/eigrpd/eigrp_vty.c b/eigrpd/eigrp_vty.c
index 1a81a338bb9e902e8dd768bd1b296283eaf4f9fe..2ad4a25422f19dd83261abeba281f246c4d80040 100644 (file)
--- a/eigrpd/eigrp_vty.c
+++ b/eigrpd/eigrp_vty.c
@@ -280,14 +280,14 @@ DEFPY (show_ip_eigrp_neighbors,
        struct eigrp *eigrp;
 
        if (vrf && strncmp(vrf, "all", sizeof("all")) == 0) {
-               struct vrf *vrf;
+               struct vrf *tvrf;
 
-               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
-                       eigrp = eigrp_lookup(vrf->vrf_id);
+               RB_FOREACH (tvrf, vrf_name_head, &vrfs_by_name) {
+                       eigrp = eigrp_lookup(tvrf->vrf_id);
                        if (!eigrp)
                                continue;
 
-                       vty_out(vty, "VRF %s:\n", vrf->name);
+                       vty_out(vty, "VRF %s:\n", tvrf->name);
 
                        eigrp_neighbors_helper(vty, eigrp, ifname, detail);
                }

diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c
index 5b0c64ffd0981517187be1fb5598427c3cf5b664..955a3203ac3b81b9aea84fcd22f3c1b45cabdb8a 100644 (file)
--- a/eigrpd/eigrp_zebra.c
+++ b/eigrpd/eigrp_zebra.c
@@ -46,7 +46,7 @@ static int eigrp_interface_address_delete(ZAPI_CALLBACK_ARGS);
 static int eigrp_zebra_read_route(ZAPI_CALLBACK_ARGS);
 
 /* Zebra structure to hold current status. */
-struct zclient *zclient = NULL;
+struct zclient *eigrp_zclient = NULL;
 
 /* For registering threads. */
 extern struct event_loop *master;
@@ -98,17 +98,17 @@ static zclient_handler *const eigrp_handlers[] = {
 
 void eigrp_zebra_init(void)
 {
-       zclient = zclient_new(master, &zclient_options_default, eigrp_handlers,
-                             array_size(eigrp_handlers));
+       eigrp_zclient = zclient_new(master, &zclient_options_default, eigrp_handlers,
+                                   array_size(eigrp_handlers));
 
-       zclient_init(zclient, ZEBRA_ROUTE_EIGRP, 0, &eigrpd_privs);
-       zclient->zebra_connected = eigrp_zebra_connected;
+       zclient_init(eigrp_zclient, ZEBRA_ROUTE_EIGRP, 0, &eigrpd_privs);
+       eigrp_zclient->zebra_connected = eigrp_zebra_connected;
 }
 
 void eigrp_zebra_stop(void)
 {
-       zclient_stop(zclient);
-       zclient_free(zclient);
+       zclient_stop(eigrp_zclient);
+       zclient_free(eigrp_zclient);
 }
 
 /* Zebra route add and delete treatment. */
@@ -192,7 +192,7 @@ void eigrp_zebra_route_add(struct eigrp *eigrp, struct prefix *p,
        struct listnode *node;
        int count = 0;
 
-       if (!zclient->redist[AFI_IP][ZEBRA_ROUTE_EIGRP])
+       if (!eigrp_zclient->redist[AFI_IP][ZEBRA_ROUTE_EIGRP])
                return;
 
        memset(&api, 0, sizeof(api));
@@ -226,14 +226,14 @@ void eigrp_zebra_route_add(struct eigrp *eigrp, struct prefix *p,
                zlog_debug("Zebra: Route add %pFX", p);
        }
 
-       zclient_route_send(ZEBRA_ROUTE_ADD, zclient, &api);
+       zclient_route_send(ZEBRA_ROUTE_ADD, eigrp_zclient, &api);
 }
 
 void eigrp_zebra_route_delete(struct eigrp *eigrp, struct prefix *p)
 {
        struct zapi_route api;
 
-       if (!zclient->redist[AFI_IP][ZEBRA_ROUTE_EIGRP])
+       if (!eigrp_zclient->redist[AFI_IP][ZEBRA_ROUTE_EIGRP])
                return;
 
        memset(&api, 0, sizeof(api));
@@ -241,7 +241,7 @@ void eigrp_zebra_route_delete(struct eigrp *eigrp, struct prefix *p)
        api.type = ZEBRA_ROUTE_EIGRP;
        api.safi = SAFI_UNICAST;
        memcpy(&api.prefix, p, sizeof(*p));
-       zclient_route_send(ZEBRA_ROUTE_DELETE, zclient, &api);
+       zclient_route_send(ZEBRA_ROUTE_DELETE, eigrp_zclient, &api);
 
        if (IS_DEBUG_EIGRP(zebra, ZEBRA_REDISTRIBUTE))
                zlog_debug("Zebra: Route del %pFX", p);
@@ -252,10 +252,8 @@ void eigrp_zebra_route_delete(struct eigrp *eigrp, struct prefix *p)
 static int eigrp_is_type_redistributed(int type, vrf_id_t vrf_id)
 {
        return ((DEFAULT_ROUTE_TYPE(type))
-                       ? vrf_bitmap_check(
-                                 &zclient->default_information[AFI_IP], vrf_id)
-                       : vrf_bitmap_check(&zclient->redist[AFI_IP][type],
-                                          vrf_id));
+                       ? vrf_bitmap_check(&eigrp_zclient->default_information[AFI_IP], vrf_id)
+                       : vrf_bitmap_check(&eigrp_zclient->redist[AFI_IP][type], vrf_id));
 }
 
 int eigrp_redistribute_set(struct eigrp *eigrp, int type,
@@ -280,7 +278,7 @@ int eigrp_redistribute_set(struct eigrp *eigrp, int type,
 
        eigrp->dmetric[type] = metric;
 
-       zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP, type, 0,
+       zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, eigrp_zclient, AFI_IP, type, 0,
                             eigrp->vrf_id);
 
        ++eigrp->redistribute;
@@ -293,7 +291,7 @@ int eigrp_redistribute_unset(struct eigrp *eigrp, int type)
 
        if (eigrp_is_type_redistributed(type, eigrp->vrf_id)) {
                memset(&eigrp->dmetric[type], 0, sizeof(struct eigrp_metrics));
-               zclient_redistribute(ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP,
+               zclient_redistribute(ZEBRA_REDISTRIBUTE_DELETE, eigrp_zclient, AFI_IP,
                                     type, 0, eigrp->vrf_id);
                --eigrp->redistribute;
        }

diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c
index 543a54da13d2a67d51a1a5eac739d8047a1c6576..bc7c60c50108a325492e666046c9060d50498b50 100644 (file)
--- a/eigrpd/eigrpd.c
+++ b/eigrpd/eigrpd.c
@@ -52,7 +52,6 @@ static struct eigrp_master eigrp_master;
 
 struct eigrp_master *eigrp_om;
 
-extern struct zclient *zclient;
 extern struct in_addr router_id_zebra;
 
 int eigrp_master_hash_cmp(const struct eigrp *a, const struct eigrp *b)

diff --git a/eigrpd/eigrpd.h b/eigrpd/eigrpd.h
index 15d2bb54ee85f454836af3121bd8eec5873d5a5e..28b1dc9a11ae07a86ec83a87c3c885c7fc14dc58 100644 (file)
--- a/eigrpd/eigrpd.h
+++ b/eigrpd/eigrpd.h
@@ -52,7 +52,7 @@ struct eigrp_master {
 };
 
 /* Extern variables. */
-extern struct zclient *zclient;
+extern struct zclient *eigrp_zclient;
 extern struct event_loop *master;
 extern struct eigrp_master *eigrp_om;
 extern struct zebra_privs_t eigrpd_privs;