osaf/services/saf/amf/amfd/include/proc.h | 11 -----------
osaf/services/saf/amf/amfd/sg.cc | 12 ------------
osaf/services/saf/amf/amfd/sg_2n_fsm.cc | 9 ---------
osaf/services/saf/amf/amfd/sg_nored_fsm.cc | 8 --------
osaf/services/saf/amf/amfd/sg_npm_fsm.cc | 8 --------
osaf/services/saf/amf/amfd/sg_nway_fsm.cc | 8 --------
osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc | 8 --------
7 files changed, 0 insertions(+), 64 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/include/proc.h
b/osaf/services/saf/amf/amfd/include/proc.h
--- a/osaf/services/saf/amf/amfd/include/proc.h
+++ b/osaf/services/saf/amf/amfd/include/proc.h
@@ -52,22 +52,11 @@ uint32_t avd_sg_su_si_mod_snd(AVD_CL_CB
uint32_t avd_sg_susi_mod_snd_honouring_si_dependency(AVD_SU *su, SaAmfHAStateT
state);
uint32_t avd_sg_su_si_del_snd(AVD_CL_CB *cb, AVD_SU *su);
-/* The following are for 2N redundancy model */
-void avd_sg_2n_init(AVD_SG *sg);
-
/* The following are for N-Way redundancy model */
uint32_t avd_sg_nway_si_assign(AVD_CL_CB *, AVD_SG *);
-void avd_sg_nway_init(AVD_SG *sg);
-
-/* The following are for N+M redundancy model */
-void avd_sg_npm_init(AVD_SG *sg);
-
-/* The following are for No redundancy model */
-void avd_sg_nored_init(AVD_SG *sg);
/* The following are for N-way Active redundancy model */
AVD_SU *avd_sg_nacvred_su_chose_asgn(AVD_CL_CB *cb, AVD_SG *sg);
-void avd_sg_nacv_init(AVD_SG *sg);
void avd_node_up_evh(AVD_CL_CB *cb, struct avd_evt_tag *evt);
void avd_reg_su_evh(AVD_CL_CB *cb, struct avd_evt_tag *evt);
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
@@ -388,18 +388,6 @@ static AVD_SG *sg_create(const SaNameT *
/* TODO use value in type instead? */
sg->sg_redundancy_model = sgt->saAmfSgtRedundancyModel;
- // initialize function pointers to red model specific handlers
- if (sg->sg_redundancy_model == SA_AMF_2N_REDUNDANCY_MODEL)
- avd_sg_2n_init(sg);
- else if (sg->sg_redundancy_model == SA_AMF_NPM_REDUNDANCY_MODEL)
- avd_sg_npm_init(sg);
- else if (sg->sg_redundancy_model == SA_AMF_N_WAY_REDUNDANCY_MODEL)
- avd_sg_nway_init(sg);
- else if (sg->sg_redundancy_model ==
SA_AMF_N_WAY_ACTIVE_REDUNDANCY_MODEL)
- avd_sg_nacv_init(sg);
- else if (sg->sg_redundancy_model == SA_AMF_NO_REDUNDANCY_MODEL)
- avd_sg_nored_init(sg);
-
rc = 0;
if (rc != 0) {
diff --git a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_2n_fsm.cc
@@ -3940,15 +3940,6 @@ AVD_SU *get_other_su_from_oper_list(AVD_
return o_su;
}
-
-/**
- * Initialize redundancy model specific handlers
- * @param sg
- */
-void avd_sg_2n_init(AVD_SG *sg)
-{
-}
-
SG_2N::~SG_2N() {
}
diff --git a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nored_fsm.cc
@@ -1217,14 +1217,6 @@ uint32_t SG_NORED::sg_admin_down(AVD_CL_
return NCSCC_RC_SUCCESS;
}
-/**
- * Initialize redundancy model specific handlers
- * @param sg
- */
-void avd_sg_nored_init(AVD_SG *sg)
-{
-}
-
SG_NORED::~SG_NORED() {
}
diff --git a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_npm_fsm.cc
@@ -4399,14 +4399,6 @@ uint32_t SG_NPM::sg_admin_down(AVD_CL_CB
return NCSCC_RC_SUCCESS;
}
-/**
- * Initialize redundancy model specific handlers
- * @param sg
- */
-void avd_sg_npm_init(AVD_SG *sg)
-{
-}
-
SG_NPM::~SG_NPM() {
}
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
@@ -3503,14 +3503,6 @@ void avd_sg_nway_node_fail_sg_realign(AV
return;
}
-/**
- * Initialize redundancy model specific handlers
- * @param sg
- */
-void avd_sg_nway_init(AVD_SG *sg)
-{
-}
-
SG_NWAY::~SG_NWAY() {
}
diff --git a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
--- a/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
+++ b/osaf/services/saf/amf/amfd/sg_nwayact_fsm.cc
@@ -1940,14 +1940,6 @@ done:
return;
}
-/**
- * Initialize redundancy model specific handlers
- * @param sg
- */
-void avd_sg_nacv_init(AVD_SG *sg)
-{
-}
-
SG_NACV::~SG_NACV() {
}
------------------------------------------------------------------------------
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
