summaryrefslogtreecommitdiff
path: root/ospfd/ospf_ldp_sync.c
diff options
context:
space:
mode:
authorMark Stapp <mjs@cisco.com>2025-01-23 15:14:49 -0500
committerMark Stapp <mjs@cisco.com>2025-04-08 14:41:27 -0400
commit0561943a780e2a6345823c80180c692d1c1f2a61 (patch)
tree68b8cf2efe780c837adceff5d3d9d478fa04521b /ospfd/ospf_ldp_sync.c
parente88f0a47782b0b81d6f04874e04a8712b1a97572 (diff)
ospfd: clean up -Wshadow warnings
Clean up various "shadow" warnings. Signed-off-by: Mark Stapp <mjs@cisco.com>
Diffstat (limited to 'ospfd/ospf_ldp_sync.c')
-rw-r--r--ospfd/ospf_ldp_sync.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/ospfd/ospf_ldp_sync.c b/ospfd/ospf_ldp_sync.c
index 496ae5b4bd..99f81f5663 100644
--- a/ospfd/ospf_ldp_sync.c
+++ b/ospfd/ospf_ldp_sync.c
@@ -28,8 +28,6 @@
#include "ospf_dump.h"
#include "ospf_ism.h"
-extern struct zclient *zclient;
-
/*
* LDP-SYNC msg between IGP and LDP
*/
@@ -98,8 +96,8 @@ void ospf_ldp_sync_state_req_msg(struct interface *ifp)
request.proto = LDP_IGP_SYNC_IF_STATE_REQUEST;
request.ifindex = ifp->ifindex;
- zclient_send_opaque(zclient, LDP_IGP_SYNC_IF_STATE_REQUEST,
- (uint8_t *)&request, sizeof(request));
+ zclient_send_opaque(ospf_zclient, LDP_IGP_SYNC_IF_STATE_REQUEST,
+ (uint8_t *)&request, sizeof(request));
}
/*
@@ -400,9 +398,9 @@ void ospf_ldp_sync_gbl_exit(struct ospf *ospf, bool remove)
*/
if (CHECK_FLAG(ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) {
/* unregister with opaque client to recv LDP-IGP Sync msgs */
- zclient_unregister_opaque(zclient,
+ zclient_unregister_opaque(ospf_zclient,
LDP_IGP_SYNC_IF_STATE_UPDATE);
- zclient_unregister_opaque(zclient,
+ zclient_unregister_opaque(ospf_zclient,
LDP_IGP_SYNC_ANNOUNCE_UPDATE);
/* disable LDP globally */
@@ -754,8 +752,8 @@ DEFPY (ospf_mpls_ldp_sync,
}
/* register with opaque client to recv LDP-IGP Sync msgs */
- zclient_register_opaque(zclient, LDP_IGP_SYNC_IF_STATE_UPDATE);
- zclient_register_opaque(zclient, LDP_IGP_SYNC_ANNOUNCE_UPDATE);
+ zclient_register_opaque(ospf_zclient, LDP_IGP_SYNC_IF_STATE_UPDATE);
+ zclient_register_opaque(ospf_zclient, LDP_IGP_SYNC_ANNOUNCE_UPDATE);
if (!CHECK_FLAG(ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) {
SET_FLAG(ospf->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE);