ack, code review only. /Rgds. HansN
-----Original Message-----
From: Hans Feldt [mailto:[email protected]]
Sent: den 2 april 2014 07:03
To: Hans Nordebäck
Cc: [email protected]
Subject: [PATCH 1 of 3] amfd: remove cast from avd_class_impl_set [#713]
osaf/services/saf/amf/amfd/app.cc | 2 +-
osaf/services/saf/amf/amfd/apptype.cc | 6 +-
osaf/services/saf/amf/amfd/cluster.cc | 2 +-
osaf/services/saf/amf/amfd/comp.cc | 2 +-
osaf/services/saf/amf/amfd/compcstype.cc | 2 +-
osaf/services/saf/amf/amfd/comptype.cc | 8 +-
osaf/services/saf/amf/amfd/csi.cc | 3 +-
osaf/services/saf/amf/amfd/csiattr.cc | 3 +-
osaf/services/saf/amf/amfd/cstype.cc | 6 +-
osaf/services/saf/amf/amfd/ctcstype.cc | 3 +-
osaf/services/saf/amf/amfd/hlt.cc | 3 +-
osaf/services/saf/amf/amfd/hlttype.cc | 4 +-
osaf/services/saf/amf/amfd/imm.cc | 76 ++++++++++++++--------------
osaf/services/saf/amf/amfd/include/imm.h | 2 +-
osaf/services/saf/amf/amfd/node.cc | 3 +-
osaf/services/saf/amf/amfd/nodegroup.cc | 3 +-
osaf/services/saf/amf/amfd/nodeswbundle.cc | 4 +-
osaf/services/saf/amf/amfd/sg.cc | 3 +-
osaf/services/saf/amf/amfd/sgtype.cc | 6 +-
osaf/services/saf/amf/amfd/si.cc | 3 +-
osaf/services/saf/amf/amfd/si_dep.cc | 3 +-
osaf/services/saf/amf/amfd/sirankedsu.cc | 9 +-
osaf/services/saf/amf/amfd/su.cc | 3 +-
osaf/services/saf/amf/amfd/sutcomptype.cc | 3 +-
osaf/services/saf/amf/amfd/sutype.cc | 6 +-
osaf/services/saf/amf/amfd/svctype.cc | 6 +-
osaf/services/saf/amf/amfd/svctypecstypes.cc | 3 +-
27 files changed, 101 insertions(+), 76 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/app.cc
b/osaf/services/saf/amf/amfd/app.cc
--- a/osaf/services/saf/amf/amfd/app.cc
+++ b/osaf/services/saf/amf/amfd/app.cc
@@ -498,7 +498,7 @@ void avd_app_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&app_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfApplication"),
app_rt_attr_cb, app_admin_op_cb,
+ avd_class_impl_set("SaAmfApplication", app_rt_attr_cb,
+app_admin_op_cb,
app_ccb_completed_cb, app_ccb_apply_cb); }
diff --git a/osaf/services/saf/amf/amfd/apptype.cc
b/osaf/services/saf/amf/amfd/apptype.cc
--- a/osaf/services/saf/amf/amfd/apptype.cc
+++ b/osaf/services/saf/amf/amfd/apptype.cc
@@ -296,7 +296,9 @@ void avd_apptype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&apptype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfAppBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfAppType"), NULL,
NULL, apptype_ccb_completed_cb, apptype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfAppBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfAppType", NULL, NULL, apptype_ccb_completed_cb,
+ apptype_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/cluster.cc
b/osaf/services/saf/amf/amfd/cluster.cc
--- a/osaf/services/saf/amf/amfd/cluster.cc
+++ b/osaf/services/saf/amf/amfd/cluster.cc
@@ -263,7 +263,7 @@ SaAisErrorT avd_cluster_config_get(void)
void avd_cluster_constructor(void)
{
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCluster"), NULL,
cluster_admin_op_cb,
+ avd_class_impl_set("SaAmfCluster", NULL, cluster_admin_op_cb,
cluster_ccb_completed_cb, cluster_ccb_apply_cb); }
diff --git a/osaf/services/saf/amf/amfd/comp.cc
b/osaf/services/saf/amf/amfd/comp.cc
--- a/osaf/services/saf/amf/amfd/comp.cc
+++ b/osaf/services/saf/amf/amfd/comp.cc
@@ -1636,7 +1636,7 @@ void avd_comp_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&comp_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfComp"),
comp_rt_attr_cb, comp_admin_op_cb,
+ avd_class_impl_set("SaAmfComp", comp_rt_attr_cb, comp_admin_op_cb,
comp_ccb_completed_cb, comp_ccb_apply_cb); }
diff --git a/osaf/services/saf/amf/amfd/compcstype.cc
b/osaf/services/saf/amf/amfd/compcstype.cc
--- a/osaf/services/saf/amf/amfd/compcstype.cc
+++ b/osaf/services/saf/amf/amfd/compcstype.cc
@@ -448,7 +448,7 @@ void avd_compcstype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&compcstype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCompCsType"),
compcstype_rt_attr_callback, NULL,
+ avd_class_impl_set("SaAmfCompCsType", compcstype_rt_attr_callback,
+NULL,
compcstype_ccb_completed_cb, compcstype_ccb_apply_cb); }
diff --git a/osaf/services/saf/amf/amfd/comptype.cc
b/osaf/services/saf/amf/amfd/comptype.cc
--- a/osaf/services/saf/amf/amfd/comptype.cc
+++ b/osaf/services/saf/amf/amfd/comptype.cc
@@ -591,8 +591,10 @@ void avd_comptype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&comptype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCompBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCompType"), NULL,
NULL, comptype_ccb_completed_cb, comptype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfCompBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfCompType", NULL, NULL,
+ comptype_ccb_completed_cb, comptype_ccb_apply_cb);
}
/*****************************************************************************/
@@ -730,7 +732,7 @@ static SaAisErrorT avd_compglobalattrs_c
void avd_compglobalattrs_constructor(void)
{
-
avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCompGlobalAttributes"),
NULL, NULL,
+ avd_class_impl_set("SaAmfCompGlobalAttributes", NULL, NULL,
avd_compglobalattrs_ccb_completed_cb,
avd_compglobalattrs_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/csi.cc
b/osaf/services/saf/amf/amfd/csi.cc
--- a/osaf/services/saf/amf/amfd/csi.cc
+++ b/osaf/services/saf/amf/amfd/csi.cc
@@ -1257,7 +1257,8 @@ void avd_csi_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&csi_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCSI"), NULL, NULL,
csi_ccb_completed_cb, csi_ccb_apply_cb);
+ avd_class_impl_set("SaAmfCSI", NULL, NULL, csi_ccb_completed_cb,
+ csi_ccb_apply_cb);
}
/**
diff --git a/osaf/services/saf/amf/amfd/csiattr.cc
b/osaf/services/saf/amf/amfd/csiattr.cc
--- a/osaf/services/saf/amf/amfd/csiattr.cc
+++ b/osaf/services/saf/amf/amfd/csiattr.cc
@@ -676,6 +676,7 @@ static void csiattr_ccb_apply_cb(CcbUtil
void avd_csiattr_constructor(void)
{
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCSIAttribute"),
NULL, NULL, csiattr_ccb_completed_cb, csiattr_ccb_apply_cb);
+ avd_class_impl_set("SaAmfCSIAttribute", NULL, NULL,
+ csiattr_ccb_completed_cb, csiattr_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/cstype.cc
b/osaf/services/saf/amf/amfd/cstype.cc
--- a/osaf/services/saf/amf/amfd/cstype.cc
+++ b/osaf/services/saf/amf/amfd/cstype.cc
@@ -291,6 +291,8 @@ void avd_cstype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&cstype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCSType"), NULL,
NULL, cstype_ccb_completed_hdlr, cstype_ccb_apply_cb);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCSBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfCSType", NULL, NULL, cstype_ccb_completed_hdlr,
+ cstype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfCSBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
}
diff --git a/osaf/services/saf/amf/amfd/ctcstype.cc
b/osaf/services/saf/amf/amfd/ctcstype.cc
--- a/osaf/services/saf/amf/amfd/ctcstype.cc
+++ b/osaf/services/saf/amf/amfd/ctcstype.cc
@@ -216,6 +216,7 @@ void avd_ctcstype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&ctcstype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfCtCsType"), NULL,
NULL, ctcstype_ccb_completed_cb, ctcstype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfCtCsType", NULL, NULL,
+ ctcstype_ccb_completed_cb, ctcstype_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/hlt.cc
b/osaf/services/saf/amf/amfd/hlt.cc
--- a/osaf/services/saf/amf/amfd/hlt.cc
+++ b/osaf/services/saf/amf/amfd/hlt.cc
@@ -184,6 +184,7 @@ static void hc_ccb_apply_cb(CcbUtilOpera
void avd_hc_constructor(void)
{
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfHealthcheck"),
NULL, NULL, hc_ccb_completed_cb, hc_ccb_apply_cb);
+ avd_class_impl_set("SaAmfHealthcheck", NULL, NULL, hc_ccb_completed_cb,
+ hc_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/hlttype.cc
b/osaf/services/saf/amf/amfd/hlttype.cc
--- a/osaf/services/saf/amf/amfd/hlttype.cc
+++ b/osaf/services/saf/amf/amfd/hlttype.cc
@@ -100,7 +100,7 @@ static void hct_ccb_apply_cb(CcbUtilOper
void avd_hctype_constructor(void)
{
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfHealthcheckType"),
- NULL, NULL, hct_ccb_completed_cb, hct_ccb_apply_cb);
+ avd_class_impl_set("SaAmfHealthcheckType", NULL, NULL,
+ hct_ccb_completed_cb, hct_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/imm.cc
b/osaf/services/saf/amf/amfd/imm.cc
--- a/osaf/services/saf/amf/amfd/imm.cc
+++ b/osaf/services/saf/amf/amfd/imm.cc
@@ -328,47 +328,47 @@ static const SaImmOiImplementerNameT imp static
SaVersionT immVersion = { 'A', 2, 11 };
/* This string array must match the AVSV_AMF_CLASS_ID enum */ -static char
*avd_class_names[] = {
- const_cast<char*>("Invalid"),
+static const char *avd_class_names[] = {
+ "Invalid",
- const_cast<char*>("SaAmfCompBaseType"),
- const_cast<char*>("SaAmfSUBaseType"),
- const_cast<char*>("SaAmfSGBaseType"),
- const_cast<char*>("SaAmfAppBaseType"),
- const_cast<char*>("SaAmfSvcBaseType"),
- const_cast<char*>("SaAmfCSBaseType"),
- const_cast<char*>("SaAmfCompGlobalAttributes"),
+ "SaAmfCompBaseType",
+ "SaAmfSUBaseType",
+ "SaAmfSGBaseType",
+ "SaAmfAppBaseType",
+ "SaAmfSvcBaseType",
+ "SaAmfCSBaseType",
+ "SaAmfCompGlobalAttributes",
- const_cast<char*>("SaAmfCompType"),
- const_cast<char*>("SaAmfCSType"),
- const_cast<char*>("SaAmfCtCsType"),
- const_cast<char*>("SaAmfHealthcheckType"),
- const_cast<char*>("SaAmfSvcType"),
- const_cast<char*>("SaAmfSvcTypeCSTypes"),
- const_cast<char*>("SaAmfSUType"),
- const_cast<char*>("SaAmfSutCompType"),
- const_cast<char*>("SaAmfSGType"),
- const_cast<char*>("SaAmfAppType"),
+ "SaAmfCompType",
+ "SaAmfCSType",
+ "SaAmfCtCsType",
+ "SaAmfHealthcheckType",
+ "SaAmfSvcType",
+ "SaAmfSvcTypeCSTypes",
+ "SaAmfSUType",
+ "SaAmfSutCompType",
+ "SaAmfSGType",
+ "SaAmfAppType",
- const_cast<char*>("SaAmfCluster"),
- const_cast<char*>("SaAmfNode"),
- const_cast<char*>("SaAmfNodeGroup"),
- const_cast<char*>("SaAmfNodeSwBundle"),
+ "SaAmfCluster",
+ "SaAmfNode",
+ "SaAmfNodeGroup",
+ "SaAmfNodeSwBundle",
- const_cast<char*>("SaAmfApplication"),
- const_cast<char*>("SaAmfSG"),
- const_cast<char*>("SaAmfSI"),
- const_cast<char*>("SaAmfCSI"),
- const_cast<char*>("SaAmfCSIAttribute"),
- const_cast<char*>("SaAmfSU"),
- const_cast<char*>("SaAmfComp"),
- const_cast<char*>("SaAmfHealthcheck"),
- const_cast<char*>("SaAmfCompCsType"),
- const_cast<char*>("SaAmfSIDependency"),
- const_cast<char*>("SaAmfSIRankedSU"),
+ "SaAmfApplication",
+ "SaAmfSG",
+ "SaAmfSI",
+ "SaAmfCSI",
+ "SaAmfCSIAttribute",
+ "SaAmfSU",
+ "SaAmfComp",
+ "SaAmfHealthcheck",
+ "SaAmfCompCsType",
+ "SaAmfSIDependency",
+ "SaAmfSIRankedSU",
- const_cast<char*>("SaAmfCSIAssignment"),
- const_cast<char*>("SaAmfSIAssignment")
+ "SaAmfCSIAssignment",
+ "SaAmfSIAssignment"
};
static AvdImmOiCcbApplyCallbackT ccb_apply_callback[AVSV_SA_AMF_CLASS_MAX];
@@ -490,7 +490,7 @@ static const SaImmAttrValuesT_2 **dupSaI
return copy;
}
-static AVSV_AMF_CLASS_ID class_name_to_class_type(const SaImmClassNameT
className)
+static AVSV_AMF_CLASS_ID class_name_to_class_type(const char
+*className)
{
int i;
@@ -1336,7 +1336,7 @@ void avd_imm_applier_set_task_create(voi
}
}
-void avd_class_impl_set(const SaImmClassNameT className,
+void avd_class_impl_set(const char *className,
SaImmOiRtAttrUpdateCallbackT rtattr_cb,
SaImmOiAdminOperationCallbackT_2 adminop_cb,
AvdImmOiCcbCompletedCallbackT ccb_compl_cb, AvdImmOiCcbApplyCallbackT
ccb_apply_cb) { diff --git a/osaf/services/saf/amf/amfd/include/imm.h
b/osaf/services/saf/amf/amfd/include/imm.h
--- a/osaf/services/saf/amf/amfd/include/imm.h
+++ b/osaf/services/saf/amf/amfd/include/imm.h
@@ -119,7 +119,7 @@ private:
* @param ccb_apply_cb
* @param ccb_abort_cb
*/
-void avd_class_impl_set(const SaImmClassNameT className,
+void avd_class_impl_set(const char *className,
SaImmOiRtAttrUpdateCallbackT rtattr_cb,
SaImmOiAdminOperationCallbackT_2 adminop_cb,
AvdImmOiCcbCompletedCallbackT ccb_compl_cb, AvdImmOiCcbApplyCallbackT
ccb_apply_cb);
/**
diff --git a/osaf/services/saf/amf/amfd/node.cc
b/osaf/services/saf/amf/amfd/node.cc
--- a/osaf/services/saf/amf/amfd/node.cc
+++ b/osaf/services/saf/amf/amfd/node.cc
@@ -1391,6 +1391,7 @@ void avd_node_constructor(void)
patricia_params.key_size = sizeof(SaClmNodeIdT);
osafassert(ncs_patricia_tree_init(&node_id_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfNode"), NULL,
node_admin_op_cb, node_ccb_completed_cb, node_ccb_apply_cb);
+ avd_class_impl_set("SaAmfNode", NULL, node_admin_op_cb,
+ node_ccb_completed_cb, node_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/nodegroup.cc
b/osaf/services/saf/amf/amfd/nodegroup.cc
--- a/osaf/services/saf/amf/amfd/nodegroup.cc
+++ b/osaf/services/saf/amf/amfd/nodegroup.cc
@@ -598,6 +598,7 @@ void avd_ng_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&nodegroup_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfNodeGroup"), NULL,
NULL, ng_ccb_completed_cb, ng_ccb_apply_cb);
+ avd_class_impl_set("SaAmfNodeGroup", NULL, NULL, ng_ccb_completed_cb,
+ ng_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/nodeswbundle.cc
b/osaf/services/saf/amf/amfd/nodeswbundle.cc
--- a/osaf/services/saf/amf/amfd/nodeswbundle.cc
+++ b/osaf/services/saf/amf/amfd/nodeswbundle.cc
@@ -167,6 +167,6 @@ static void nodeswbdl_ccb_apply_cb(CcbUt
void avd_nodeswbundle_constructor(void)
{
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfNodeSwBundle"),
NULL, NULL, nodeswbdl_ccb_completed_cb, nodeswbdl_ccb_apply_cb);
+ avd_class_impl_set("SaAmfNodeSwBundle", NULL, NULL,
+ nodeswbdl_ccb_completed_cb, nodeswbdl_ccb_apply_cb);
}
-
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
@@ -1484,7 +1484,8 @@ void avd_sg_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&sg_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSG"),
sg_rt_attr_cb, sg_admin_op_cb, sg_ccb_completed_cb, sg_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSG", sg_rt_attr_cb, sg_admin_op_cb,
+ sg_ccb_completed_cb, sg_ccb_apply_cb);
}
void avd_sg_admin_state_set(AVD_SG* sg, SaAmfAdminStateT state) diff --git
a/osaf/services/saf/amf/amfd/sgtype.cc b/osaf/services/saf/amf/amfd/sgtype.cc
--- a/osaf/services/saf/amf/amfd/sgtype.cc
+++ b/osaf/services/saf/amf/amfd/sgtype.cc
@@ -505,6 +505,8 @@ void avd_sgtype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&sgtype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSGType"), NULL,
NULL, sgtype_ccb_completed_cb, sgtype_ccb_apply_cb);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSGBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfSGType", NULL, NULL, sgtype_ccb_completed_cb,
+ sgtype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSGBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
}
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
@@ -1387,7 +1387,8 @@ void avd_si_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&si_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSI"),
si_rt_attr_cb, si_admin_op_cb, si_ccb_completed_cb, si_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSI", si_rt_attr_cb, si_admin_op_cb,
+ si_ccb_completed_cb, si_ccb_apply_cb);
}
void avd_si_admin_state_set(AVD_SI* si, SaAmfAdminStateT state) 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
@@ -1592,7 +1592,8 @@ void avd_sidep_constructor(void)
rc = ncs_patricia_tree_init(&si_dep.dep_anchor, &patricia_params);
osafassert(rc == NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSIDependency"),
NULL, NULL, sidep_ccb_completed_cb, sidep_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSIDependency", NULL, NULL,
sidep_ccb_completed_cb,
+ sidep_ccb_apply_cb);
}
void avd_sidep_start_tolerance_timer_for_dependant(AVD_SI *dep_si, AVD_SI
*spons_si) { 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
@@ -583,10 +583,11 @@ SaAisErrorT avd_sirankedsu_config_get(Sa
void avd_sirankedsu_constructor(void)
{
- NCS_PATRICIA_PARAMS patricia_params;
+ NCS_PATRICIA_PARAMS patricia_params;
- patricia_params.key_size = sizeof(AVD_SUS_PER_SI_RANK_INDX);
- osafassert(ncs_patricia_tree_init(&sirankedsu_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSIRankedSU"),
NULL, NULL, sirankedsu_ccb_completed_cb, sirankedsu_ccb_apply_cb);
+ patricia_params.key_size = sizeof(AVD_SUS_PER_SI_RANK_INDX);
+ osafassert(ncs_patricia_tree_init(&sirankedsu_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
+ avd_class_impl_set("SaAmfSIRankedSU", NULL, NULL,
+ sirankedsu_ccb_completed_cb, sirankedsu_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/su.cc b/osaf/services/saf/amf/amfd/su.cc
--- a/osaf/services/saf/amf/amfd/su.cc
+++ b/osaf/services/saf/amf/amfd/su.cc
@@ -1608,7 +1608,8 @@ void avd_su_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&su_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSU"),
su_rt_attr_cb, su_admin_op_cb, su_ccb_completed_cb, su_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSU", su_rt_attr_cb, su_admin_op_cb,
+ su_ccb_completed_cb, su_ccb_apply_cb);
}
/**
diff --git a/osaf/services/saf/amf/amfd/sutcomptype.cc
b/osaf/services/saf/amf/amfd/sutcomptype.cc
--- a/osaf/services/saf/amf/amfd/sutcomptype.cc
+++ b/osaf/services/saf/amf/amfd/sutcomptype.cc
@@ -184,6 +184,7 @@ void avd_sutcomptype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&sutcomptype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSutCompType"),
NULL, NULL, sutcomptype_ccb_completed_cb, sutcomptype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSutCompType", NULL, NULL,
+ sutcomptype_ccb_completed_cb, sutcomptype_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/sutype.cc
b/osaf/services/saf/amf/amfd/sutype.cc
--- a/osaf/services/saf/amf/amfd/sutype.cc
+++ b/osaf/services/saf/amf/amfd/sutype.cc
@@ -445,6 +445,8 @@ void avd_sutype_constructor(void)
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&sutype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSUBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSUType"), NULL,
NULL, sutype_ccb_completed_cb, sutype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSUBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfSUType", NULL, NULL,
+ sutype_ccb_completed_cb, sutype_ccb_apply_cb);
}
diff --git a/osaf/services/saf/amf/amfd/svctype.cc
b/osaf/services/saf/amf/amfd/svctype.cc
--- a/osaf/services/saf/amf/amfd/svctype.cc
+++ b/osaf/services/saf/amf/amfd/svctype.cc
@@ -314,7 +314,9 @@ void avd_svctype_constructor(void)
osafassert(ncs_patricia_tree_init(&svctype_db, &patricia_params) ==
NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSvcType"), NULL,
NULL, svctype_ccb_completed_cb, svctype_ccb_apply_cb);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSvcBaseType"),
NULL, NULL, avd_imm_default_OK_completed_cb, NULL);
+ avd_class_impl_set("SaAmfSvcType", NULL, NULL, svctype_ccb_completed_cb,
+ svctype_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSvcBaseType", NULL, NULL,
+ avd_imm_default_OK_completed_cb, NULL);
}
diff --git a/osaf/services/saf/amf/amfd/svctypecstypes.cc
b/osaf/services/saf/amf/amfd/svctypecstypes.cc
--- a/osaf/services/saf/amf/amfd/svctypecstypes.cc
+++ b/osaf/services/saf/amf/amfd/svctypecstypes.cc
@@ -185,6 +185,7 @@ void avd_svctypecstypes_constructor(void
patricia_params.key_size = sizeof(SaNameT);
osafassert(ncs_patricia_tree_init(&svctypecstypes_db, &patricia_params)
== NCSCC_RC_SUCCESS);
- avd_class_impl_set(const_cast<SaImmClassNameT>("SaAmfSvcTypeCSTypes"),
NULL, NULL, svctypecstypes_ccb_completed_cb, svctypecstypes_ccb_apply_cb);
+ avd_class_impl_set("SaAmfSvcTypeCSTypes", NULL, NULL,
+ svctypecstypes_ccb_completed_cb, svctypecstypes_ccb_apply_cb);
}
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
