osaf/services/saf/amf/amfd/compcstype.cc | 38 ++++++++++++++----------------
osaf/services/saf/amf/amfd/include/comp.h | 27 +++++++++++----------
2 files changed, 32 insertions(+), 33 deletions(-)
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
@@ -43,32 +43,30 @@ static char *StrDup(const char *s)
}
//
-AVD_COMPCS_TYPE::AVD_COMPCS_TYPE()
-: saAmfCompNumMaxActiveCSIs(0), saAmfCompNumMaxStandbyCSIs(0),
- saAmfCompNumCurrActiveCSIs(0), saAmfCompNumCurrStandbyCSIs(0),
- comp(0)
-{
- saAmfCompAssignedCsi = new std::vector<SaNameT>;
-
- memset(&name, '\0', sizeof(SaNameT));
+void AVD_COMPCS_TYPE::initialize() {
+ name = {};
+ saAmfCompNumMaxActiveCSIs = {};
+ saAmfCompNumMaxStandbyCSIs = {};
+ saAmfCompNumCurrActiveCSIs = {};
+ saAmfCompNumCurrStandbyCSIs = {};
+ saAmfCompAssignedCsi = new std::vector<SaNameT>;
+ comp = {};
+}
+//
+AVD_COMPCS_TYPE::AVD_COMPCS_TYPE() {
+ initialize();
}
//
-AVD_COMPCS_TYPE::AVD_COMPCS_TYPE(const SaNameT *dn)
-: saAmfCompNumMaxActiveCSIs(0), saAmfCompNumMaxStandbyCSIs(0),
- saAmfCompNumCurrActiveCSIs(0), saAmfCompNumCurrStandbyCSIs(0),
- comp(0)
-{
- saAmfCompAssignedCsi = new std::vector<SaNameT>;
-
- memcpy(name.value, dn->value, dn->length);
- name.length = dn->length;
+AVD_COMPCS_TYPE::AVD_COMPCS_TYPE(const SaNameT *dn) {
+ initialize();
+ memcpy(name.value, dn->value, dn->length);
+ name.length = dn->length;
}
//
-AVD_COMPCS_TYPE::~AVD_COMPCS_TYPE()
-{
- delete saAmfCompAssignedCsi;
+AVD_COMPCS_TYPE::~AVD_COMPCS_TYPE() {
+ delete saAmfCompAssignedCsi;
}
void avd_compcstype_db_add(AVD_COMPCS_TYPE *cst)
diff --git a/osaf/services/saf/amf/amfd/include/comp.h
b/osaf/services/saf/amf/amfd/include/comp.h
--- a/osaf/services/saf/amf/amfd/include/comp.h
+++ b/osaf/services/saf/amf/amfd/include/comp.h
@@ -156,22 +156,23 @@ extern AmfDb<std::string, AVD_COMP_TYPE
/* AMF Class SaAmfCompCsType */
class AVD_COMPCS_TYPE {
public:
- AVD_COMPCS_TYPE();
- ~AVD_COMPCS_TYPE();
+ AVD_COMPCS_TYPE();
+ ~AVD_COMPCS_TYPE();
- explicit AVD_COMPCS_TYPE(const SaNameT *dn);
+ explicit AVD_COMPCS_TYPE(const SaNameT *dn);
- SaNameT name;
- SaUint32T saAmfCompNumMaxActiveCSIs;
- SaUint32T saAmfCompNumMaxStandbyCSIs;
- SaUint32T saAmfCompNumCurrActiveCSIs;
- SaUint32T saAmfCompNumCurrStandbyCSIs;
- std::vector<SaNameT> *saAmfCompAssignedCsi;
- AVD_COMP *comp;
+ SaNameT name;
+ SaUint32T saAmfCompNumMaxActiveCSIs;
+ SaUint32T saAmfCompNumMaxStandbyCSIs;
+ SaUint32T saAmfCompNumCurrActiveCSIs;
+ SaUint32T saAmfCompNumCurrStandbyCSIs;
+ std::vector<SaNameT> *saAmfCompAssignedCsi;
+ AVD_COMP *comp;
private:
- // disallow copy and assign
- AVD_COMPCS_TYPE(const AVD_COMPCS_TYPE&);
- void operator=(const AVD_COMPCS_TYPE&);
+ void initialize();
+ // disallow copy and assign
+ AVD_COMPCS_TYPE(const AVD_COMPCS_TYPE&);
+ void operator=(const AVD_COMPCS_TYPE&);
};
extern AmfDb<std::string, AVD_COMPCS_TYPE> *compcstype_db;
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
