matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

mgmtd: clean up -Wshadow warnings

Browse source 
Clean up various variable-shadow warnings in mgmtd.

Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
Mark Stapp 2025-01-24 15:20:48 -05:00
parent 1378ebf640
commit 7e1ed59d74
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mgmtd/mgmt_ds.c
View file

@ -151,9 +151,9 @@ void mgmt_ds_reset_candidate(void)
}
int mgmt_ds_init(struct mgmt_master *mm)
int mgmt_ds_init(struct mgmt_master *m)
{
if (mgmt_ds_mm || mm->running_ds || mm->candidate_ds || mm->oper_ds)
if (mgmt_ds_mm || m->running_ds || m->candidate_ds || m->oper_ds)
assert(!"MGMTD: Call ds_init only once!");
/* Use Running DS from NB module??? */
@ -178,10 +178,10 @@ int mgmt_ds_init(struct mgmt_master *mm)
oper.config_ds = false;
oper.ds_id = MGMTD_DS_OPERATIONAL;
mm->running_ds = &running;
mm->candidate_ds = &candidate;
mm->oper_ds = &oper;
mgmt_ds_mm = mm;
m->running_ds = &running;
m->candidate_ds = &candidate;
m->oper_ds = &oper;
mgmt_ds_mm = m;
return 0;
}
@ -195,16 +195,15 @@ void mgmt_ds_destroy(void)
oper.root.dnode_root = NULL;
}
struct mgmt_ds_ctx *mgmt_ds_get_ctx_by_id(struct mgmt_master *mm,
Mgmtd__DatastoreId ds_id)
struct mgmt_ds_ctx *mgmt_ds_get_ctx_by_id(struct mgmt_master *m, Mgmtd__DatastoreId ds_id)
{
switch (ds_id) {
case MGMTD_DS_CANDIDATE:
return (mm->candidate_ds);
return (m->candidate_ds);
case MGMTD_DS_RUNNING:
return (mm->running_ds);
return (m->running_ds);
case MGMTD_DS_OPERATIONAL:
return (mm->oper_ds);
return (m->oper_ds);
case MGMTD_DS_NONE:
case MGMTD__DATASTORE_ID__STARTUP_DS:
case _MGMTD__DATASTORE_ID_IS_INT_SIZE:

1
mgmtd/mgmt_fe_adapter.c
View file

@ -1442,7 +1442,6 @@ static void fe_adapter_handle_get_data(struct mgmt_fe_session_ctx *session,
/* Check for yang-library shortcut */
if (nb_oper_is_yang_lib_query(msg->xpath)) {
struct lyd_node *ylib = NULL;
LY_ERR err;
err = ly_ctx_get_yanglib_data(ly_native_ctx, &ylib, "%u",
ly_ctx_get_change_count(

12
mgmtd/mgmt_txn.c
View file

@ -1993,17 +1993,17 @@ static void mgmt_txn_register_event(struct mgmt_txn_ctx *txn,
}
}
int mgmt_txn_init(struct mgmt_master *mm, struct event_loop *tm)
int mgmt_txn_init(struct mgmt_master *m, struct event_loop *loop)
{
if (mgmt_txn_mm || mgmt_txn_tm)
assert(!"MGMTD TXN: Call txn_init() only once");
mgmt_txn_mm = mm;
mgmt_txn_tm = tm;
mgmt_txns_init(&mm->txn_list);
mgmt_txn_mm = m;
mgmt_txn_tm = loop;
mgmt_txns_init(&m->txn_list);
mgmt_txn_hash_init();
assert(!mm->cfg_txn);
mm->cfg_txn = NULL;
assert(!m->cfg_txn);
m->cfg_txn = NULL;
return 0;
}