osaf/services/saf/amf/amfd/include/si.h | 5 +++--
osaf/services/saf/amf/amfd/si.cc | 14 +++++++-------
osaf/services/saf/amf/amfd/sirankedsu.cc | 4 ++--
3 files changed, 12 insertions(+), 11 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
@@ -122,6 +122,9 @@ public:
void set_admin_state(SaAmfAdminStateT state);
+ void add_rankedsu(const SaNameT *suname, uint32_t saAmfRank);
+ void remove_rankedsu(const SaNameT *suname);
+
private:
AVD_SI(const AVD_SI&);
AVD_SI& operator=(const AVD_SI&);
@@ -181,7 +184,5 @@ extern SaAisErrorT avd_svctypecstypes_co
extern void avd_svctypecstypes_constructor(void);
extern void avd_si_assignments_delete(AVD_CL_CB *cb, AVD_SI *si);
-extern void avd_si_add_rankedsu(AVD_SI *si, const SaNameT *suname, uint32_t
saAmfRank);
-extern void avd_si_remove_rankedsu(AVD_SI *si, const SaNameT *suname);
#endif
diff --git a/osaf/services/saf/amf/amfd/si.cc b/osaf/services/saf/amf/amfd/si.cc
--- a/osaf/services/saf/amf/amfd/si.cc
+++ b/osaf/services/saf/amf/amfd/si.cc
@@ -206,7 +206,7 @@ static void avd_si_add_csi_db(struct avd
* @param suname
* @param saAmfRank
*/
-void avd_si_add_rankedsu(AVD_SI *si, const SaNameT *suname, uint32_t saAmfRank)
+void AVD_SI::add_rankedsu(const SaNameT *suname, uint32_t saAmfRank)
{
avd_sirankedsu_t *tmp;
avd_sirankedsu_t *prev = NULL;
@@ -217,7 +217,7 @@ void avd_si_add_rankedsu(AVD_SI *si, con
ranked_su->suname = *suname;
ranked_su->saAmfRank = saAmfRank;
- for (tmp = si->rankedsu_list_head; tmp != NULL; tmp = tmp->next) {
+ for (tmp = rankedsu_list_head; tmp != NULL; tmp = tmp->next) {
if (tmp->saAmfRank >= saAmfRank)
break;
else
@@ -225,8 +225,8 @@ void avd_si_add_rankedsu(AVD_SI *si, con
}
if (prev == NULL) {
- ranked_su->next = si->rankedsu_list_head;
- si->rankedsu_list_head = ranked_su;
+ ranked_su->next = rankedsu_list_head;
+ rankedsu_list_head = ranked_su;
} else {
ranked_su->next = prev->next;
prev->next = ranked_su;
@@ -239,20 +239,20 @@ void avd_si_add_rankedsu(AVD_SI *si, con
* @param si
* @param suname
*/
-void avd_si_remove_rankedsu(AVD_SI *si, const SaNameT *suname)
+void AVD_SI::remove_rankedsu(const SaNameT *suname)
{
avd_sirankedsu_t *tmp;
avd_sirankedsu_t *prev = NULL;
TRACE_ENTER();
- for (tmp = si->rankedsu_list_head; tmp != NULL; tmp = tmp->next) {
+ for (tmp = rankedsu_list_head; tmp != NULL; tmp = tmp->next) {
if (memcmp(&tmp->suname, suname, sizeof(*suname)) == 0)
break;
prev = tmp;
}
if (prev == NULL)
- si->rankedsu_list_head = NULL;
+ rankedsu_list_head = NULL;
else
prev->next = tmp->next;
diff --git a/osaf/services/saf/amf/amfd/sirankedsu.cc
b/osaf/services/saf/amf/amfd/sirankedsu.cc
--- a/osaf/services/saf/amf/amfd/sirankedsu.cc
+++ b/osaf/services/saf/amf/amfd/sirankedsu.cc
@@ -46,7 +46,7 @@ static void avd_sirankedsu_db_add(AVD_SU
/* Find the si name. */
avd_si = avd_si_get(&(sirankedsu->indx.si_name));
- avd_si_add_rankedsu(avd_si, &sirankedsu->su_name,
sirankedsu->indx.su_rank);
+ avd_si->add_rankedsu(&sirankedsu->su_name, sirankedsu->indx.su_rank);
/* Add sus_per_si_rank to si */
sirankedsu->sus_per_si_rank_on_si = avd_si;
@@ -318,7 +318,7 @@ static void avd_sirankedsu_del_si_list(A
sus_per_si_rank->sus_per_si_rank_list_si_next;
}
}
-
avd_si_remove_rankedsu(sus_per_si_rank->sus_per_si_rank_on_si,&sus_per_si_rank->su_name);
+
sus_per_si_rank->sus_per_si_rank_on_si->remove_rankedsu(&sus_per_si_rank->su_name);
sus_per_si_rank->sus_per_si_rank_list_si_next = NULL;
sus_per_si_rank->sus_per_si_rank_on_si = NULL;
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
