[devel] [PATCH 1/1] amfd: fix coding issue identify by codechecker [#3168]

[thuan.tran]

---
 src/amf/amfd/node.cc             | 7 ++++---
 src/amf/common/amf_db_template.h | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/amf/amfd/node.cc b/src/amf/amfd/node.cc
index b8d8a7d77..ee0d65757 100644
--- a/src/amf/amfd/node.cc
+++ b/src/amf/amfd/node.cc
@@ -400,12 +400,12 @@ SaAisErrorT avd_node_config_get(void) {
                                      (SaImmAttrValuesT_2 ***)&attributes) ==
          SA_AIS_OK) {
     if (!is_config_valid(Amf::to_string(&dn), attributes, nullptr)) {
-      error = SA_AIS_ERR_FAILED_OPERATION;
+      rc = SA_AIS_ERR_FAILED_OPERATION;
       goto done2;
     }
 
     if ((node = node_create(Amf::to_string(&dn), attributes)) == nullptr) {
-      error = SA_AIS_ERR_FAILED_OPERATION;
+      rc = SA_AIS_ERR_FAILED_OPERATION;
       goto done2;
     }
 
@@ -762,6 +762,7 @@ static void node_ccb_apply_delete_hdlr(AVD_AVND *node) {
     TRACE_ENTER();
     return;
   }
+  osafassert(node != nullptr);
   TRACE_ENTER2("'%s'", node->name.c_str());
   avd_cb->failover_list.erase(node->node_info.nodeId);
   avd_node_delete_nodeid(node);
@@ -779,7 +780,7 @@ static void 
node_ccb_apply_modify_hdlr(CcbUtilOperationData_t *opdata) {
   node = avd_node_get(Amf::to_string(&opdata->objectName));
   osafassert(node != nullptr);
 
-  const SaNameTWrapper node_name(node->name);
+  SaNameTWrapper node_name(node->name);
 
   i = 0;
   /* Modifications can be done for the following parameters. */
diff --git a/src/amf/common/amf_db_template.h b/src/amf/common/amf_db_template.h
index 1765be191..bed938f99 100644
--- a/src/amf/common/amf_db_template.h
+++ b/src/amf/common/amf_db_template.h
@@ -43,6 +43,7 @@ class SaNameTWrapper {
 
   // note: SaNameT will become invalid if this SaNameTWrapper is destroyed
   operator const SaNameT() const { return name; }
+  operator SaNameT() { return name; }
 
   void set(const std::string &str) {
     osaf_extended_name_free(&name);
-- 
2.17.1



_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel