osaf/services/saf/amf/amfd/include/si.h | 2 ++
osaf/services/saf/amf/amfd/si_dep.cc | 6 +++---
2 files changed, 5 insertions(+), 3 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
@@ -48,6 +48,7 @@
#include <vector>
class AVD_APP;
+class AVD_SI_DEP;
/* Enum values defines different SI-SI dependency FSM states. */
typedef enum {
@@ -151,6 +152,7 @@ public:
bool sponsors_assigned_active();
uint32_t unassign_dependent(AVD_CL_CB *cb);
void stop_tol_timer(AVD_CL_CB *cb);
+ bool in_sponsor_list(const AVD_SI_DEP *rec);
private:
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
@@ -311,11 +311,11 @@ void sidep_spons_list_del(AVD_SI_DEP *si
TRACE_LEAVE();
}
-static bool rec_already_in_sponsor_list(const AVD_SI *si, const AVD_SI_DEP
*rec)
+bool AVD_SI::in_sponsor_list(const AVD_SI_DEP *rec)
{
AVD_SPONS_SI_NODE *node;
- for (node = si->spons_si_list; node; node = node->next)
+ for (node = spons_si_list; node; node = node->next)
if (node->sidep_rec == rec)
return true;
@@ -337,7 +337,7 @@ void avd_si_dep_spons_list_add(AVD_SI *d
{
AVD_SPONS_SI_NODE *spons_si_node;
- if (rec_already_in_sponsor_list(dep_si, rec))
+ if (dep_si->in_sponsor_list(rec) == true)
return;
spons_si_node = new AVD_SPONS_SI_NODE();
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
