osaf/services/saf/amf/amfd/include/si.h | 1 +
osaf/services/saf/amf/amfd/include/si_dep.h | 1 -
osaf/services/saf/amf/amfd/si_dep.cc | 12 ++++++------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/si.h
b/osaf/services/saf/amf/amfd/include/si.h
--- a/osaf/services/saf/amf/amfd/include/si.h
+++ b/osaf/services/saf/amf/amfd/include/si.h
@@ -145,6 +145,7 @@ public:
bool si_active();
bool all_sponsors_active();
void unassign();
+ void update_dependents_states();
private:
AVD_SI(const AVD_SI&);
diff --git a/osaf/services/saf/amf/amfd/include/si_dep.h
b/osaf/services/saf/amf/amfd/include/si_dep.h
--- a/osaf/services/saf/amf/amfd/include/si_dep.h
+++ b/osaf/services/saf/amf/amfd/include/si_dep.h
@@ -89,7 +89,6 @@ extern void sidep_take_action_on_depende
extern bool avd_sidep_sponsors_assignment_states(AVD_SI *si);
extern void sidep_si_take_action(AVD_SI *si);
extern void sidep_update_si_self_dep_state(AVD_SI *si);
-extern void sidep_update_dependents_states(AVD_SI *si);
extern void sidep_process_ready_to_unassign_depstate(AVD_SI *dep_si);
extern void avd_sidep_sg_take_action(AVD_SG *sg);
#endif
diff --git a/osaf/services/saf/amf/amfd/si_dep.cc
b/osaf/services/saf/amf/amfd/si_dep.cc
--- a/osaf/services/saf/amf/amfd/si_dep.cc
+++ b/osaf/services/saf/amf/amfd/si_dep.cc
@@ -702,7 +702,7 @@ void sidep_si_screen_si_dependencies(AVD
/*update si_dep_state of dependent sis of si.*/
if (si->num_dependents)
- sidep_update_dependents_states(si);
+ si->update_dependents_states();
TRACE_LEAVE();
}
@@ -2205,20 +2205,20 @@ done:
* @return Nothing
*
**/
-void sidep_update_dependents_states(AVD_SI *si)
+void AVD_SI::update_dependents_states()
{
- if (si->num_dependents == 0)
+ if (num_dependents == 0)
return;
/* Update the si_dep_state for all dependents
* SIs of the sponsor SI.
*/
- TRACE("sponsor si:'%s', dep state:'%s'", si->name.value,
depstatename[si->si_dep_state]);
+ TRACE("sponsor si:'%s', dep state:'%s'", name.value,
depstatename[si_dep_state]);
for (std::map<std::pair<std::string,std::string>,
AVD_SI_DEP*>::const_iterator it = sidep_db->begin();
it != sidep_db->end(); it++) {
const AVD_SI_DEP *sidep = it->second;
- if (m_CMP_HORDER_SANAMET(sidep->spons_si->name, si->name) != 0)
+ if (m_CMP_HORDER_SANAMET(sidep->spons_si->name, name) != 0)
continue;
AVD_SI *dep_si = avd_si_get(&sidep->dep_name);
@@ -2228,7 +2228,7 @@ void sidep_update_dependents_states(AVD_
stable or if both sponsor and dependent belongs to same SG.
*/
if ((dep_si->sg_of_si->sg_fsm_state == AVD_SG_FSM_STABLE) ||
- (dep_si->sg_of_si == si->sg_of_si))
+ (dep_si->sg_of_si == sg_of_si))
sidep_update_si_self_dep_state(dep_si);
}
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
