mgmtd: clean up -Wshadow warnings

Clean up various variable-shadow warnings in mgmtd.

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

diff --git a/mgmtd/mgmt_ds.c b/mgmtd/mgmt_ds.c
index dabae4afd1b0274884ce258dcf8b9a1dadcda148..a50ba015a3a35fe254497edb68a037977465aae5 100644 (file)
--- a/mgmtd/mgmt_ds.c
+++ b/mgmtd/mgmt_ds.c
@@ -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:

diff --git a/mgmtd/mgmt_fe_adapter.c b/mgmtd/mgmt_fe_adapter.c
index 8d591988037669c93c93a9cb305b694c176d1c47..ff3165f369ae9f7eb9f4d71bf1d91ccd45f37f7d 100644 (file)
--- a/mgmtd/mgmt_fe_adapter.c
+++ b/mgmtd/mgmt_fe_adapter.c
@@ -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(

diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c
index 483dfab8e85e005a1291ec5e596d0e2b81915894..9e06ce9f5f71d7c1f6a0080dce64939e2613abf8 100644 (file)
--- a/mgmtd/mgmt_txn.c
+++ b/mgmtd/mgmt_txn.c
@@ -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;
 }