One minor correction at AMFD:
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
@@ -1772,10 +1772,13 @@ void d2n_msg_free(AVSV_DND_MSG *msg)
case AVSV_D2N_OPERATION_REQUEST_MSG:
osaf_extended_name_free(&msg->msg_info.d2n_op_req.param_info.name);
osaf_extended_name_free(&msg->msg_info.d2n_op_req.param_info.name_sec);
+ break;
case AVSV_D2N_ADMIN_OP_REQ_MSG:
osaf_extended_name_free(&msg->msg_info.d2n_admin_op_req_info.dn);
+ break;
case AVSV_D2N_PRESENCE_SU_MSG:
osaf_extended_name_free(&msg->msg_info.d2n_prsc_su.su_name);
+ break;
default:
break;
}
Thanks,
Praveen
On 19-Aug-16 1:17 PM, Gary Lee wrote:
> osaf/services/saf/amf/amfd/nodegroup.cc | 12 ++++++------
> osaf/services/saf/amf/amfd/ntf.cc | 4 ++--
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>
> 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
> @@ -583,16 +583,16 @@ static void ng_ccb_apply_modify_hdlr(Ccb
> rc = immutil_saImmOmAccessorGet_2(accessorHandle,
> &opdata->objectName,
> nullptr, (SaImmAttrValuesT_2 ***)&attributes);
> if (rc != SA_AIS_OK) {
> - LOG_ER("saImmOmAccessorGet_2 FAILED %u for %s", rc,
> opdata->objectName.value);
> + LOG_ER("saImmOmAccessorGet_2 FAILED %u for %s", rc,
> osaf_extended_name_borrow(&opdata->objectName));
> goto done;
> }
> - TRACE("'%s'", opdata->objectName.value);
> - if ((ng = ng_create(&opdata->objectName, attributes)) ==
> nullptr) {
> - LOG_ER("ng_create failed for %s",
> opdata->objectName.value);
> + TRACE("'%s'", osaf_extended_name_borrow(&opdata->objectName));
> + if ((ng = ng_create(Amf::to_string(&opdata->objectName),
> attributes)) == nullptr) {
> + LOG_ER("ng_create failed for %s",
> osaf_extended_name_borrow(&opdata->objectName));
> goto done;
> }
> - nodegroup_db->insert(Amf::to_string(&ng->name), ng);
> - TRACE("ng '%s' created with number_nodes '%u'", ng->name.value,
> + nodegroup_db->insert(ng->name, ng);
> + TRACE("ng '%s' created with number_nodes '%u'",
> ng->name.c_str(),
> ng->number_nodes());
> immutil_saImmOmAccessorFinalize(accessorHandle);
> }
> 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
> @@ -552,7 +552,7 @@ uint32_t sendAlarmNotificationAvd(AVD_CL
>
> if (avd_cb->ntfHandle == 0) {
> LOG_ER("NTF handle has not been initialized, alarm notification
> "
> - "for (%s) will be lost", ntf_object.value);
> + "for (%s) will be lost", ntf_object.c_str());
> return status;
> }
>
> @@ -650,7 +650,7 @@ uint32_t sendStateChangeNotificationAvd(
>
> if (avd_cb->ntfHandle == 0) {
> LOG_WA("NTF handle has not been initialized, state change
> notification "
> - "for (%s) will be lost", ntf_object.value);
> + "for (%s) will be lost", ntf_object.c_str());
> return status;
> }
>
>
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
