osaf/services/saf/amf/amfd/ckpt_edu.cc |  182 ++++++++++++++++----------------
 1 files changed, 91 insertions(+), 91 deletions(-)


diff --git a/osaf/services/saf/amf/amfd/ckpt_edu.cc 
b/osaf/services/saf/amf/amfd/ckpt_edu.cc
--- a/osaf/services/saf/amf/amfd/ckpt_edu.cc
+++ b/osaf/services/saf/amf/amfd/ckpt_edu.cc
@@ -109,27 +109,27 @@ uint32_t avsv_edp_ckpt_msg_cb(EDU_HDL *h
                           NCSCONTEXT ptr, uint32_t *ptr_data_len, EDU_BUF_ENV 
*buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVD_CL_CB *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_CL_CB *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_cb_rules[] = {
-               {EDU_START, avsv_edp_ckpt_msg_cb, 0, 0, 0, sizeof(AVD_CL_CB), 
0, NULL},
+               {EDU_START, avsv_edp_ckpt_msg_cb, 0, 0, 0, sizeof(AVD_CL_CB), 
0, nullptr},
 
                /* AVD Control block information */
                {EDU_EXEC, ncs_edp_int, 0, 0, 0,
-                (long)&((AVD_CL_CB *)0)->init_state, 0, NULL},
+                (long)&((AVD_CL_CB *)0)->init_state, 0, nullptr},
                {EDU_EXEC, m_NCS_EDP_SATIMET, 0, 0, 0,
-                (long)&((AVD_CL_CB *)0)->cluster_init_time, 0, NULL},
+                (long)&((AVD_CL_CB *)0)->cluster_init_time, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVD_CL_CB *)0)->nodes_exit_cnt, 0, NULL},
+                (long)&((AVD_CL_CB *)0)->nodes_exit_cnt, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_CL_CB *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_CL_CB **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -160,19 +160,19 @@ uint32_t avsv_edp_ckpt_msg_cluster(EDU_H
        EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVD_CLUSTER *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_CLUSTER *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_cluster_rules[] = {
-               {EDU_START, avsv_edp_ckpt_msg_cluster, 0, 0, 0, 
sizeof(AVD_CLUSTER), 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_CLUSTER 
*)0)->saAmfClusterAdminState, 0, NULL},
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_START, avsv_edp_ckpt_msg_cluster, 0, 0, 0, 
sizeof(AVD_CLUSTER), 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_CLUSTER 
*)0)->saAmfClusterAdminState, 0, nullptr},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_CLUSTER *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_CLUSTER **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -204,33 +204,33 @@ uint32_t avsv_edp_ckpt_msg_node(EDU_HDL 
        EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVD_AVND *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_AVND *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_node_rules[] = {
-               {EDU_START, avsv_edp_ckpt_msg_node, 0, 0, 0, sizeof(AVD_AVND), 
0, NULL},
+               {EDU_START, avsv_edp_ckpt_msg_node, 0, 0, 0, sizeof(AVD_AVND), 
0, nullptr},
 
                /* Fill here AVD AVND config data structure encoding rules */
-               {EDU_EXEC, m_NCS_EDP_SACLMNODEIDT, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.nodeId, 0, NULL},
-               {EDU_EXEC, ncs_edp_saclmnodeaddresst, 0, 0, 0, 
(long)&((AVD_AVND *)0)->node_info.nodeAddress, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_AVND 
*)0)->name, 0, NULL},
-               {EDU_EXEC, ncs_edp_int, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.member, 0, NULL},
-               {EDU_EXEC, m_NCS_EDP_SATIMET, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.bootTimestamp, 0, NULL},
-               {EDU_EXEC, m_NCS_EDP_SAUINT64T, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.initialViewNumber, 0, NULL},
-               {EDU_EXEC, ncs_edp_mds_dest, 0, 0, 0, (long)&((AVD_AVND 
*)0)->adest, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->saAmfNodeAdminState, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->saAmfNodeOperState, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_state, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->type, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->rcv_msg_id, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->snd_msg_id, 0, NULL},
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_EXEC, m_NCS_EDP_SACLMNODEIDT, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.nodeId, 0, nullptr},
+               {EDU_EXEC, ncs_edp_saclmnodeaddresst, 0, 0, 0, 
(long)&((AVD_AVND *)0)->node_info.nodeAddress, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_AVND 
*)0)->name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_int, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.member, 0, nullptr},
+               {EDU_EXEC, m_NCS_EDP_SATIMET, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.bootTimestamp, 0, nullptr},
+               {EDU_EXEC, m_NCS_EDP_SAUINT64T, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_info.initialViewNumber, 0, nullptr},
+               {EDU_EXEC, ncs_edp_mds_dest, 0, 0, 0, (long)&((AVD_AVND 
*)0)->adest, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->saAmfNodeAdminState, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->saAmfNodeOperState, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->node_state, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->type, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->rcv_msg_id, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_AVND 
*)0)->snd_msg_id, 0, nullptr},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_AVND *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_AVND **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -260,26 +260,26 @@ uint32_t avsv_edp_ckpt_msg_comp(EDU_HDL 
                             NCSCONTEXT ptr, uint32_t *ptr_data_len, 
EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVD_COMP *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_COMP *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_comp_rules[] = {
-               {EDU_START, avsv_edp_ckpt_msg_comp, 0, 0, 0, sizeof(AVD_COMP), 
0, NULL},
+               {EDU_START, avsv_edp_ckpt_msg_comp, 0, 0, 0, sizeof(AVD_COMP), 
0, nullptr},
 
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMP 
*)0)->comp_info.name, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompOperState, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompReadinessState, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompPresenceState, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompRestartCount, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompCurrProxyName, 0, NULL},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMP 
*)0)->comp_info.name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompOperState, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompReadinessState, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompPresenceState, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompRestartCount, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMP 
*)0)->saAmfCompCurrProxyName, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_COMP *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_COMP **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -310,30 +310,30 @@ uint32_t avsv_edp_ckpt_msg_siass(EDU_HDL
                                  EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR 
*o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVSV_SU_SI_REL_CKPT_MSG *struct_ptr = NULL, **d_ptr = NULL;
+       AVSV_SU_SI_REL_CKPT_MSG *struct_ptr = nullptr, **d_ptr = nullptr;
        uint16_t base_ver = AVD_MBCSV_SUB_PART_VERSION_3;
 
        EDU_INST_SET avsv_ckpt_msg_su_si_rel_rules[] = {
                {EDU_START, avsv_edp_ckpt_msg_siass, 0, 0, 0,
-                sizeof(AVSV_SU_SI_REL_CKPT_MSG), 0, NULL},
+                sizeof(AVSV_SU_SI_REL_CKPT_MSG), 0, nullptr},
 
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->su_name, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->si_name, 0, NULL},
-               {EDU_EXEC, m_NCS_EDP_SAAMFHASTATET, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->state, 0, NULL},
-               {EDU_EXEC, ncs_edp_int, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->fsm, 0, NULL},
-               {EDU_VER_GE, NULL,   0, 0, 4, 0, 0, (EDU_EXEC_RTINE)((uint16_t 
*)(&(base_ver)))},
-               {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->csi_add_rem, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->comp_name, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->csi_name, 0, NULL},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->su_name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->si_name, 0, nullptr},
+               {EDU_EXEC, m_NCS_EDP_SAAMFHASTATET, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->state, 0, nullptr},
+               {EDU_EXEC, ncs_edp_int, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->fsm, 0, nullptr},
+               {EDU_VER_GE, nullptr,   0, 0, 4, 0, 0, 
(EDU_EXEC_RTINE)((uint16_t *)(&(base_ver)))},
+               {EDU_EXEC, ncs_edp_ncs_bool, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->csi_add_rem, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->comp_name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SU_SI_REL_CKPT_MSG *)0)->csi_name, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVSV_SU_SI_REL_CKPT_MSG *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVSV_SU_SI_REL_CKPT_MSG **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -365,53 +365,53 @@ uint32_t avsv_edp_ckpt_msg_async_updt_cn
                                       EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, 
EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVSV_ASYNC_UPDT_CNT *struct_ptr = NULL, **d_ptr = NULL;
+       AVSV_ASYNC_UPDT_CNT *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_async_updt_cnt_rules[] = {
                {EDU_START, avsv_edp_ckpt_msg_async_updt_cnt, 0, 0, 0,
-                sizeof(AVSV_ASYNC_UPDT_CNT), 0, NULL}
+                sizeof(AVSV_ASYNC_UPDT_CNT), 0, nullptr}
                ,
 
                /*
                 * Fill here Async Update data structure encoding rules 
                 */
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->cb_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->cb_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->node_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->node_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->app_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->app_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->su_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->su_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->si_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->si_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_su_oprlist_updt, 0, 
NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_su_oprlist_updt, 0, 
nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_admin_si_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->sg_admin_si_updt, 0, 
nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->siass_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->siass_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->comp_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->comp_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->csi_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->csi_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->compcstype_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->compcstype_updt, 0, 
nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->si_trans_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->si_trans_updt, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->ng_updt, 0, NULL},
+                (long)&((AVSV_ASYNC_UPDT_CNT *)0)->ng_updt, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVSV_ASYNC_UPDT_CNT *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVSV_ASYNC_UPDT_CNT **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -444,27 +444,27 @@ uint32_t avsv_edp_ckpt_msg_sus_per_si_ra
                                        EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, 
EDU_ERR *o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVD_SUS_PER_SI_RANK *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_SUS_PER_SI_RANK *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_sus_per_si_rank_rules[] = {
                {EDU_START, avsv_edp_ckpt_msg_sus_per_si_rank, 0, 0, 0,
-                sizeof(AVD_SUS_PER_SI_RANK), 0, NULL},
+                sizeof(AVD_SUS_PER_SI_RANK), 0, nullptr},
 
                /* Fill here AVD SUS PER SI RANK data structure encoding rules 
*/
                {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0,
-                (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.si_name, 0, NULL},
+                (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.si_name, 0, nullptr},
                {EDU_EXEC, ncs_edp_uns32, 0, 0, 0,
-                (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.su_rank, 0, NULL},
+                (long)&((AVD_SUS_PER_SI_RANK *)0)->indx.su_rank, 0, nullptr},
                {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0,
-                (long)&((AVD_SUS_PER_SI_RANK *)0)->su_name, 0, NULL},
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+                (long)&((AVD_SUS_PER_SI_RANK *)0)->su_name, 0, nullptr},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_SUS_PER_SI_RANK *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_SUS_PER_SI_RANK **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -499,23 +499,23 @@ uint32_t avsv_edp_ckpt_msg_comp_cs_type(
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
 
-       AVD_COMPCS_TYPE *struct_ptr = NULL, **d_ptr = NULL;
+       AVD_COMPCS_TYPE *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_comp_cs_type_rules[] = {
-               {EDU_START, avsv_edp_ckpt_msg_comp_cs_type, 0, 0, 0, 
sizeof(AVD_COMPCS_TYPE), 0, NULL}  ,
+               {EDU_START, avsv_edp_ckpt_msg_comp_cs_type, 0, 0, 0, 
sizeof(AVD_COMPCS_TYPE), 0, nullptr}       ,
 
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->name, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->saAmfCompNumCurrActiveCSIs, 0, NULL},
-               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->saAmfCompNumCurrStandbyCSIs, 0, NULL},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->saAmfCompNumCurrActiveCSIs, 0, nullptr},
+               {EDU_EXEC, ncs_edp_uns32, 0, 0, 0, (long)&((AVD_COMPCS_TYPE 
*)0)->saAmfCompNumCurrStandbyCSIs, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVD_COMPCS_TYPE *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVD_COMPCS_TYPE **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }
@@ -545,25 +545,25 @@ uint32_t avsv_edp_ckpt_msg_si_trans(EDU_
                                  EDU_BUF_ENV *buf_env, EDP_OP_TYPE op, EDU_ERR 
*o_err)
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
-       AVSV_SI_TRANS_CKPT_MSG *struct_ptr = NULL, **d_ptr = NULL;
+       AVSV_SI_TRANS_CKPT_MSG *struct_ptr = nullptr, **d_ptr = nullptr;
 
        EDU_INST_SET avsv_ckpt_msg_si_trans_rules[] = {
                {EDU_START, avsv_edp_ckpt_msg_si_trans, 0, 0, 0,
-                sizeof(AVSV_SI_TRANS_CKPT_MSG), 0, NULL},
+                sizeof(AVSV_SI_TRANS_CKPT_MSG), 0, nullptr},
 
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->sg_name, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->si_name, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->min_su_name, 0, NULL},
-               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->max_su_name, 0, NULL},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->sg_name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->si_name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->min_su_name, 0, nullptr},
+               {EDU_EXEC, ncs_edp_sanamet, 0, 0, 0, 
(long)&((AVSV_SI_TRANS_CKPT_MSG *)0)->max_su_name, 0, nullptr},
 
-               {EDU_END, 0, 0, 0, 0, 0, 0, NULL},
+               {EDU_END, 0, 0, 0, 0, 0, 0, nullptr},
        };
 
        if (op == EDP_OP_TYPE_ENC) {
                struct_ptr = (AVSV_SI_TRANS_CKPT_MSG *)ptr;
        } else if (op == EDP_OP_TYPE_DEC) {
                d_ptr = (AVSV_SI_TRANS_CKPT_MSG **)ptr;
-               if (*d_ptr == NULL) {
+               if (*d_ptr == nullptr) {
                        *o_err = EDU_ERR_MEM_FAIL;
                        return NCSCC_RC_FAILURE;
                }

------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to