osaf/services/saf/amf/amfd/sg.cc | 2 +-
osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 2 +-
osaf/services/saf/amf/amfd/sgproc.cc | 6 +++---
osaf/services/saf/amf/amfd/siass.cc | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -66,7 +66,7 @@ static void sg_add_to_model(AVD_SG *sg)
}
avsv_sanamet_init(&sg->name, &dn, "safApp");
- sg->app = app_db->find(&dn);
+ sg->app = app_db->find(Amf::to_string(&dn));
avd_sg_db_add(sg);
sg->sg_type = avd_sgtype_get(&sg->saAmfSGType);
diff --git a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nway_fsm.cc
@@ -1389,7 +1389,7 @@ AVD_SU *avd_sg_nway_si_find_highest_sira
/* Iterate through the si->rankedsu_list_head to find the highest
sirankedsu */
sirankedsu = si->rankedsu_list_head;
for (; sirankedsu ; sirankedsu = sirankedsu->next) {
- if ((ranked_su = su_db->find(&sirankedsu->suname)) != NULL) {
+ if ((ranked_su =
su_db->find(Amf::to_string(&sirankedsu->suname))) != NULL) {
if (ranked_su == *assigned_su) {
TRACE("SI is assigned to highest SIRankedSU
for this SI");
break;
diff --git a/osaf/services/saf/amf/amfd/sgproc.cc
b/osaf/services/saf/amf/amfd/sgproc.cc
--- a/osaf/services/saf/amf/amfd/sgproc.cc
+++ b/osaf/services/saf/amf/amfd/sgproc.cc
@@ -425,7 +425,7 @@ void avd_su_oper_state_evh(AVD_CL_CB *cb
/* get the SU from the tree */
- if ((su = su_db->find(&n2d_msg->msg_info.n2d_opr_state.su_name)) ==
NULL) {
+ if ((su =
su_db->find(Amf::to_string(&n2d_msg->msg_info.n2d_opr_state.su_name))) == NULL)
{
LOG_ER("%s: %s not found", __FUNCTION__,
n2d_msg->msg_info.n2d_opr_state.su_name.value);
goto done;
}
@@ -798,7 +798,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb,
* SU operation.
*/
- if ((su =
su_db->find(&n2d_msg->msg_info.n2d_su_si_assign.su_name)) == NULL) {
+ if ((su =
su_db->find(Amf::to_string(&n2d_msg->msg_info.n2d_su_si_assign.su_name))) ==
NULL) {
LOG_ER("%s:%d %s", __FUNCTION__, __LINE__,
n2d_msg->msg_info.n2d_su_si_assign.su_name.value);
goto done;
}
@@ -1126,7 +1126,7 @@ void avd_su_si_assign_evh(AVD_CL_CB *cb,
SI could be assigned to SU successfully if there was any. The
operation failed if
AvND encountered error while assigning/unassigning SI to the SU. */
- su = su_db->find(&n2d_msg->msg_info.n2d_su_si_assign.su_name);
+ su =
su_db->find(Amf::to_string(&n2d_msg->msg_info.n2d_su_si_assign.su_name));
if (su != NULL) {
if (su->pend_cbk.invocation != 0) {
diff --git a/osaf/services/saf/amf/amfd/siass.cc
b/osaf/services/saf/amf/amfd/siass.cc
--- a/osaf/services/saf/amf/amfd/siass.cc
+++ b/osaf/services/saf/amf/amfd/siass.cc
@@ -178,7 +178,7 @@ AVD_SU_SI_REL *avd_susi_create(AVD_CL_CB
for (su_rank_rec = avd_sirankedsu_getnext(cb, i_idx);
su_rank_rec && (m_CMP_HORDER_SANAMET(su_rank_rec->indx.si_name,
si->name) == 0);
su_rank_rec = avd_sirankedsu_getnext(cb, su_rank_rec->indx)) {
- curr_su = su_db->find(&su_rank_rec->su_name);
+ curr_su = su_db->find(Amf::to_string(&su_rank_rec->su_name));
if (curr_su == su)
break;
}
@@ -201,7 +201,7 @@ AVD_SU_SI_REL *avd_susi_create(AVD_CL_CB
i_su_rank_rec
&&
(m_CMP_HORDER_SANAMET(i_su_rank_rec->indx.si_name, si->name) == 0);
i_su_rank_rec = avd_sirankedsu_getnext(cb,
i_su_rank_rec->indx)) {
- curr_su = su_db->find(&i_su_rank_rec->su_name);
+ curr_su =
su_db->find(Amf::to_string(&i_su_rank_rec->su_name));
if (curr_su == i_su_si->su)
break;
}
@@ -324,7 +324,7 @@ AVD_SU_SI_REL *avd_susi_find(AVD_CL_CB *
{
AVD_SU *su;
- if ((su = su_db->find(su_name)) == NULL)
+ if ((su = su_db->find(Amf::to_string(su_name))) == NULL)
return NULL;
return avd_su_susi_find(cb, su, si_name);
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
