osaf/services/saf/amf/amfd/ndmsg.cc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/ndmsg.cc
b/osaf/services/saf/amf/amfd/ndmsg.cc
--- a/osaf/services/saf/amf/amfd/ndmsg.cc
+++ b/osaf/services/saf/amf/amfd/ndmsg.cc
@@ -110,7 +110,7 @@ uint32_t avd_mds_cpy(MDS_CALLBACK_COPY_I
TRACE_ENTER();
- if (cpy_info->i_msg == NULL) {
+ if (cpy_info->i_msg == nullptr) {
LOG_ER("%s: no msg", __FUNCTION__);
return NCSCC_RC_FAILURE;
}
@@ -151,9 +151,9 @@ uint32_t avd_mds_dec(MDS_CALLBACK_DEC_IN
if (rc != NCSCC_RC_SUCCESS) {
LOG_ER("%s: decode failed %u %u", __FUNCTION__, rc, ederror);
- if (dec_info->o_msg != NULL) {
+ if (dec_info->o_msg != nullptr) {
avsv_dnd_msg_free(static_cast<AVSV_DND_MSG*>(dec_info->o_msg));
- dec_info->o_msg = NULL;
+ dec_info->o_msg = nullptr;
}
return rc;
@@ -228,7 +228,7 @@ uint32_t avd_d2n_msg_dequeue(AVD_CL_CB *
m_AVD_DTOND_MSG_POP(cb, queue_elem);
- while (queue_elem != NULL) {
+ while (queue_elem != nullptr) {
/*
* Now do MDS send.
*/
@@ -344,7 +344,7 @@ uint32_t avd_n2d_msg_rcv(AVD_DND_MSG *rc
TRACE_ENTER();
- if (rcv_msg == NULL) {
+ if (rcv_msg == nullptr) {
LOG_ER("%s: no msg", __FUNCTION__);
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
@@ -365,7 +365,7 @@ uint32_t avd_n2d_msg_rcv(AVD_DND_MSG *rc
if (m_NCS_IPC_SEND(&cb->avd_mbx, evt, NCS_IPC_PRIORITY_HIGH) !=
NCSCC_RC_SUCCESS) {
LOG_ER("%s: ncs_ipc_send failed", __FUNCTION__);
avsv_dnd_msg_free(rcv_msg);
- evt->info.avnd_msg = NULL;
+ evt->info.avnd_msg = nullptr;
delete evt;
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
