osaf/services/saf/amf/amfd/comp.cc | 1 +
osaf/services/saf/amf/amfd/include/node.h | 1 +
osaf/services/saf/amf/amfd/include/ntf.h | 4 ++--
osaf/services/saf/amf/amfd/include/si_dep.h | 2 +-
osaf/services/saf/amf/amfd/node.cc | 6 +++++-
osaf/services/saf/amf/amfd/ntf.cc | 6 +++---
osaf/services/saf/amf/amfd/si_dep.cc | 2 +-
osaf/services/saf/amf/amfd/sirankedsu.cc | 4 ++--
osaf/services/saf/amf/amfd/util.cc | 5 +++--
9 files changed, 19 insertions(+), 12 deletions(-)
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
@@ -54,6 +54,7 @@ void avd_comp_db_add(AVD_COMP *comp)
//
void AVD_COMP::initialize() {
+ saAmfCompType = {};
comp_info = {};
comp_info.cap = SA_AMF_COMP_ONE_ACTIVE_OR_ONE_STANDBY;
comp_info.category = AVSV_COMP_TYPE_NON_SAF;
diff --git a/osaf/services/saf/amf/amfd/include/node.h
b/osaf/services/saf/amf/amfd/include/node.h
--- a/osaf/services/saf/amf/amfd/include/node.h
+++ b/osaf/services/saf/amf/amfd/include/node.h
@@ -77,6 +77,7 @@ class AVD_AVND {
public:
AVD_AVND();
explicit AVD_AVND(const SaNameT* dn);
+ ~AVD_AVND();
bool is_node_lock();
SaNameT name; /* DN */
diff --git a/osaf/services/saf/amf/amfd/include/ntf.h
b/osaf/services/saf/amf/amfd/include/ntf.h
--- a/osaf/services/saf/amf/amfd/include/ntf.h
+++ b/osaf/services/saf/amf/amfd/include/ntf.h
@@ -79,7 +79,7 @@ SaAisErrorT fill_ntf_header_part(SaNtfNo
int type); /* add_info 0 --> no, 1-->
node_name, 2--> si_name*/
uint32_t sendAlarmNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT comp_name,
+ const SaNameT &comp_name,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
@@ -89,7 +89,7 @@ uint32_t sendAlarmNotificationAvd(AVD_CL
int type); /* add_info 0 --> no, 1-->
node_name, 2--> si_name*/
uint32_t sendStateChangeNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT comp_name,
+ const SaNameT &comp_name,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
diff --git a/osaf/services/saf/amf/amfd/include/si_dep.h
b/osaf/services/saf/amf/amfd/include/si_dep.h
--- a/osaf/services/saf/amf/amfd/include/si_dep.h
+++ b/osaf/services/saf/amf/amfd/include/si_dep.h
@@ -93,6 +93,6 @@ extern void sidep_update_si_self_dep_sta
extern void sidep_update_dependents_states(AVD_SI *si);
extern void sidep_process_ready_to_unassign_depstate(AVD_SI *dep_si);
extern void avd_sidep_sg_take_action(AVD_SG *sg);
-extern void get_dependent_si_list(SaNameT spons_si_name, std::list<AVD_SI*>&
depsi_list);
+extern void get_dependent_si_list(const SaNameT &spons_si_name,
std::list<AVD_SI*>& depsi_list);
extern void avd_sidep_activ_amfd_tol_timer_expiry(AVD_SI *spons_si, AVD_SI
*dep_si);
#endif
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
@@ -154,6 +154,11 @@ AVD_AVND::AVD_AVND(const SaNameT *dn) {
}
//
+AVD_AVND::~AVD_AVND() {
+ delete [] node_name;
+}
+
+//
AVD_AVND *avd_node_new(const SaNameT *dn)
{
AVD_AVND *node;
@@ -170,7 +175,6 @@ void avd_node_delete(AVD_AVND *node)
avd_node_delete_nodeid(node);
m_AVSV_SEND_CKPT_UPDT_ASYNC_RMV(avd_cb, node,
AVSV_CKPT_AVD_NODE_CONFIG);
node_name_db->erase(Amf::to_string(&node->name));
- delete [] node->node_name;
delete node;
}
diff --git a/osaf/services/saf/amf/amfd/ntf.cc
b/osaf/services/saf/amf/amfd/ntf.cc
--- a/osaf/services/saf/amf/amfd/ntf.cc
+++ b/osaf/services/saf/amf/amfd/ntf.cc
@@ -483,7 +483,7 @@ void avd_alarm_clear(const SaNameT *name
SaAisErrorT fill_ntf_header_part_avd(SaNtfNotificationHeaderT
*notificationHeader,
SaNtfEventTypeT eventType,
- SaNameT comp_name,
+ const SaNameT &comp_name,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
@@ -552,7 +552,7 @@ SaAisErrorT fill_ntf_header_part_avd(SaN
}
uint32_t sendAlarmNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT ntf_object,
+ const SaNameT &ntf_object,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
@@ -638,7 +638,7 @@ uint32_t sendAlarmNotificationAvd(AVD_CL
}
uint32_t sendStateChangeNotificationAvd(AVD_CL_CB *avd_cb,
- SaNameT ntf_object,
+ const SaNameT &ntf_object,
SaUint8T *add_text,
SaUint16T majorId,
SaUint16T minorId,
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
@@ -2554,7 +2554,7 @@ done:
* @param [in] @spons_si_name: Name of sponsor si
* @param [out] @depsi_list: list of dependent si
*/
-void get_dependent_si_list(SaNameT spons_si_name, std::list<AVD_SI*>&
depsi_list)
+void get_dependent_si_list(const SaNameT &spons_si_name, std::list<AVD_SI*>&
depsi_list)
{
std::map<std::pair<std::string,std::string>,
AVD_SI_DEP*>::const_iterator it;
for (it = sidep_db->begin(); it != sidep_db->end(); it++) {
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
@@ -72,7 +72,7 @@ static void avd_sirankedsu_db_add(AVD_SU
*
**************************************************************************/
-static AVD_SUS_PER_SI_RANK *avd_sirankedsu_create(AVD_CL_CB *cb,
AVD_SUS_PER_SI_RANK_INDX indx)
+static AVD_SUS_PER_SI_RANK *avd_sirankedsu_create(AVD_CL_CB *cb, const
AVD_SUS_PER_SI_RANK_INDX &indx)
{
AVD_SUS_PER_SI_RANK *ranked_su_per_si;
@@ -103,7 +103,7 @@ static AVD_SUS_PER_SI_RANK *avd_siranked
*
**************************************************************************/
-static AVD_SUS_PER_SI_RANK *avd_sirankedsu_find(AVD_CL_CB *cb,
AVD_SUS_PER_SI_RANK_INDX indx)
+static AVD_SUS_PER_SI_RANK *avd_sirankedsu_find(AVD_CL_CB *cb, const
AVD_SUS_PER_SI_RANK_INDX &indx)
{
AVD_SUS_PER_SI_RANK *ranked_su_per_si = nullptr;
AVD_SUS_PER_SI_RANK_INDX rank_indx;
diff --git a/osaf/services/saf/amf/amfd/util.cc
b/osaf/services/saf/amf/amfd/util.cc
--- a/osaf/services/saf/amf/amfd/util.cc
+++ b/osaf/services/saf/amf/amfd/util.cc
@@ -1372,15 +1372,16 @@ void avsv_sanamet_init_from_association_
*/
int amfd_file_dump(const char *filename)
{
+ const int PATH_LEN = 128;
const AVD_SU_SI_REL *susi;
const AVD_SI *si;
const AVD_CSI *csi;
const char *path = filename;
+ char _path[PATH_LEN];
if (filename == nullptr) {
- char _path[128];
// add unique suffix to state file
- sprintf(_path, "/tmp/amfd.state.%d", getpid());
+ snprintf(_path, PATH_LEN, "/tmp/amfd.state.%d", getpid());
path = _path;
}
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
