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 | 14 +++++++-------
3 files changed, 8 insertions(+), 8 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
@@ -146,6 +146,7 @@ public:
bool all_sponsors_active();
void unassign();
void update_dependents_states();
+ void screen_si_dependencies();
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
@@ -72,7 +72,6 @@ AVD_SI_DEP *avd_sidep_find(AVD_SI *spons
void avd_sidep_tol_tmr_evh(AVD_CL_CB *cb, struct avd_evt_tag *evt);
void avd_sidep_assign_evh(AVD_CL_CB *cb, struct avd_evt_tag *evt);
void avd_sidep_unassign_evh(AVD_CL_CB *cb, struct avd_evt_tag *evt);
-void sidep_si_screen_si_dependencies(AVD_SI *si);
void avd_sidep_update_si_dep_state_for_all_sis(AVD_SG *sg);
void sidep_stop_tol_timer(AVD_CL_CB *cb, AVD_SI *si);
extern SaAisErrorT avd_sidep_config_get(void);
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
@@ -671,7 +671,7 @@ void avd_sidep_update_si_dep_state_for_a
/*Avoid screening if si is neither a sponsor si nor a dependent
si*/
if ((si->spons_si_list != NULL) || (si->num_dependents > 0))
- sidep_si_screen_si_dependencies(si);
+ si->screen_si_dependencies();
}
TRACE_LEAVE();
}
@@ -693,16 +693,16 @@ void avd_sidep_update_si_dep_state_for_a
* NOTES:
*
**************************************************************************/
-void sidep_si_screen_si_dependencies(AVD_SI *si)
+void AVD_SI::screen_si_dependencies()
{
- TRACE_ENTER2("%s", si->name.value);
+ TRACE_ENTER2("%s", name.value);
/*update the si_dep_state of si based on assignement states of its
sponsors*/
- sidep_update_si_self_dep_state(si);
+ sidep_update_si_self_dep_state(this);
/*update si_dep_state of dependent sis of si.*/
- if (si->num_dependents)
- si->update_dependents_states();
+ if (num_dependents)
+ update_dependents_states();
TRACE_LEAVE();
}
@@ -1364,7 +1364,7 @@ static void sidep_ccb_apply_cb(CcbUtilOp
delete sidep;
if (avd_cb->avail_state_avd == SA_AMF_HA_ACTIVE) {
/* Update the SI according to its existing sponsors
state */
- sidep_si_screen_si_dependencies(dep_si);
+ dep_si->screen_si_dependencies();
sidep_si_take_action(dep_si);
}
break;
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
