---
 src/ckpt/ckptnd/cpnd_amf.cc  |  8 ++---
 src/ckpt/ckptnd/cpnd_db.cc   |  4 +--
 src/ckpt/ckptnd/cpnd_evt.cc  | 47 ++++++++++++------------
 src/ckpt/ckptnd/cpnd_init.cc |  9 ++---
 src/ckpt/ckptnd/cpnd_main.cc |  2 +-
 src/ckpt/ckptnd/cpnd_mds.cc  | 86 ++++++++++++++++++++++++--------------------
 src/ckpt/ckptnd/cpnd_proc.cc | 26 +++++++-------
 src/ckpt/ckptnd/cpnd_res.cc  | 20 +++++------
 src/ckpt/common/cpsv_evt.c   |  5 ++-
 src/ckpt/common/cpsv_evt.h   | 31 +++++++++++++---
 10 files changed, 134 insertions(+), 104 deletions(-)

diff --git a/src/ckpt/ckptnd/cpnd_amf.cc b/src/ckpt/ckptnd/cpnd_amf.cc
index 59dbf4f..929b077 100644
--- a/src/ckpt/ckptnd/cpnd_amf.cc
+++ b/src/ckpt/ckptnd/cpnd_amf.cc
@@ -68,7 +68,7 @@ void cpnd_saf_health_chk_callback(SaInvocationT invocation,
        uint32_t cb_hdl = m_CPND_GET_CB_HDL;
 
        /* Get the CB from the handle */
-       cpnd_cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
+       cpnd_cb = (CPND_CB *) ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
 
        if (!cpnd_cb) {
                LOG_ER("cpnd cb hdl take failed");
@@ -244,7 +244,7 @@ void cpnd_amf_comp_terminate_callback(SaInvocationT 
invocation,
        int fd;
        TRACE_ENTER();
 
-       cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
+       cb = (CPND_CB *) ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
        if (cb == NULL) {
                LOG_ER("cpnd cb take handle failed in amf term callback");
                return;
@@ -282,7 +282,7 @@ void cpnd_amf_csi_rmv_callback(SaInvocationT invocation,
        SaAisErrorT saErr = SA_AIS_OK;
 
        TRACE_ENTER();
-       cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
+       cb = (CPND_CB *) ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
        if (cb == NULL) {
                LOG_ER("cpnd cb take handle failed in rmv callback");
                return;
@@ -341,7 +341,7 @@ void cpnd_saf_csi_set_cb(SaInvocationT invocation, const 
SaNameT *compName,
        SaAisErrorT saErr = SA_AIS_OK;
 
        TRACE_ENTER();
-       cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
+       cb = (CPND_CB *) ncshm_take_hdl(NCS_SERVICE_ID_CPND, gl_cpnd_cb_hdl);
        if (cb) {
                cb->ha_state = haState; /* Set the HA State */
 
diff --git a/src/ckpt/ckptnd/cpnd_db.cc b/src/ckpt/ckptnd/cpnd_db.cc
index a511f2b..5f7d749 100644
--- a/src/ckpt/ckptnd/cpnd_db.cc
+++ b/src/ckpt/ckptnd/cpnd_db.cc
@@ -455,7 +455,7 @@ CPND_CKPT_SECTION_INFO *cpnd_ckpt_sec_add(CPND_CB *cb, 
CPND_CKPT_NODE *cp_node,
                /* convert the lcl_sec_id to Network order */
                value = lcl_sec_id;
                pSecPtr->sec_id.id =
-                   m_MMGR_ALLOC_CPND_DEFAULT(pSecPtr->sec_id.idLen);
+                       (unsigned char *) 
m_MMGR_ALLOC_CPND_DEFAULT(pSecPtr->sec_id.idLen);
                if (pSecPtr->sec_id.id == NULL) {
                        LOG_ER("cpnd sect memory allocation failed");
                        goto sec_id_allocate_fails;
@@ -473,7 +473,7 @@ CPND_CKPT_SECTION_INFO *cpnd_ckpt_sec_add(CPND_CB *cb, 
CPND_CKPT_NODE *cp_node,
                pSecPtr->sec_id.id = NULL;
                if (id->idLen > 0) {
                        pSecPtr->sec_id.id =
-                           m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
+                               (unsigned char *) 
m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
                        memcpy(pSecPtr->sec_id.id, id->id,
                               pSecPtr->sec_id.idLen);
                }
diff --git a/src/ckpt/ckptnd/cpnd_evt.cc b/src/ckpt/ckptnd/cpnd_evt.cc
index 25083a5..58d4ad9 100644
--- a/src/ckpt/ckptnd/cpnd_evt.cc
+++ b/src/ckpt/ckptnd/cpnd_evt.cc
@@ -23,9 +23,9 @@
   FUNCTIONS INCLUDED in this module:
   cpnd_process_evt .........CPND Event processing routine.
 ******************************************************************************/
-
 #include "ckpt/ckptnd/cpnd.h"
-
+#include "base/logtrace.h"
+#include "ckpt/common/cpsv_evt.h"
 extern uint32_t cpnd_proc_rdset_start(CPND_CB *cb, CPND_CKPT_NODE *cp_node);
 extern uint32_t cpnd_proc_non_colloc_rt_expiry(CPND_CB *cb,
                                               SaCkptCheckpointHandleT ckpt_id);
@@ -228,14 +228,14 @@ void cpnd_process_evt(CPSV_EVT *evt)
        }
 
        /* Get the CB from the handle */
-       cb = m_CPND_TAKE_CPND_CB;
+       cb = (CPND_CB *) m_CPND_TAKE_CPND_CB;
        if (cb == NULL) {
                LOG_ER("cpnd cb take handle failed");
                cpnd_evt_destroy(evt);
                return;
        }
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_RECEIVE, evt, evt->sinfo.dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_RECEIVE, evt, evt->sinfo.dest);
 
        switch (evt->info.cpnd.type) {
        case CPND_EVT_MDS_INFO:
@@ -459,8 +459,8 @@ void cpnd_process_evt(CPSV_EVT *evt)
        /* Remove item from deadlock prevention sync send list */
        m_NCS_LOCK(&cb->cpnd_sync_send_lock, NCS_LOCK_WRITE);
 
-       node = ncs_remove_item(&cb->cpnd_sync_send_list, (void *)evt,
-                              cpnd_match_evt);
+       node = (CPND_SYNC_SEND_NODE *)ncs_remove_item(&cb->cpnd_sync_send_list, 
(void *)evt,
+                        cpnd_match_evt);
 
        if (node)
                m_MMGR_FREE_CPND_SYNC_SEND_NODE(node);
@@ -519,14 +519,14 @@ static void sendStateChangeNotification(CPND_CB *cb,
                        *ntfStateChange.notificationHeader.eventType =
                                SA_NTF_OBJECT_STATE_CHANGE;
 
-                       name = malloc(strlen(node->ckpt_name) + 1);
+                       name = (char *)malloc(strlen(node->ckpt_name) + 1);
                        strcpy(name, node->ckpt_name);
                        name[strlen(node->ckpt_name)] = '\0';
                        osaf_extended_name_steal(
                                name,
                                
ntfStateChange.notificationHeader.notificationObject);
 
-                       name = malloc(sizeof("safApp=safCkptService"));
+                       name = (char *)malloc(sizeof("safApp=safCkptService"));
                        strcpy(name, "safApp=safCkptService");
                        name[sizeof("safApp=safCkptService") - 1] = '\0';
                        osaf_extended_name_steal(
@@ -595,7 +595,7 @@ static uint32_t cpnd_evt_proc_ckpt_init(CPND_CB *cb, 
CPND_EVT *evt,
                                        CPSV_SEND_INFO *sinfo)
 {
        CPSV_EVT send_evt;
-       uint32_t rc = NCSCC_RC_SUCCESS;
+       SaAisErrorT rc = SA_AIS_OK;
        CPND_CKPT_CLIENT_NODE *cl_node = NULL;
        int32_t cl_offset;
 
@@ -655,7 +655,7 @@ agent_rsp:
        send_evt.info.cpa.type = CPA_EVT_ND2A_CKPT_INIT_RSP;
        send_evt.info.cpa.info.initRsp.error = rc;
 
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
 
        TRACE_LEAVE();
        return rc;
@@ -2277,7 +2277,7 @@ static uint32_t cpnd_evt_proc_ckpt_mem_size(CPND_CB *cb, 
CPND_EVT *evt,
 {
 
        CPND_CKPT_NODE *cp_node = NULL;
-       uint32_t rc = SA_AIS_OK;
+       SaAisErrorT rc = SA_AIS_OK;
        CPSV_EVT send_evt;
 
        TRACE_ENTER();
@@ -2301,7 +2301,7 @@ static uint32_t cpnd_evt_proc_ckpt_mem_size(CPND_CB *cb, 
CPND_EVT *evt,
        send_evt.info.cpd.info.ckpt_mem_used.error = rc;
 
 end:
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
        TRACE_LEAVE();
        return rc;
 }
@@ -2320,7 +2320,7 @@ static uint32_t cpnd_evt_proc_ckpt_num_sections(CPND_CB 
*cb, CPND_EVT *evt,
 {
 
        CPND_CKPT_NODE *cp_node = NULL;
-       uint32_t rc = SA_AIS_OK;
+       SaAisErrorT rc = SA_AIS_OK;
        CPSV_EVT send_evt;
 
        TRACE_ENTER();
@@ -2346,7 +2346,7 @@ static uint32_t cpnd_evt_proc_ckpt_num_sections(CPND_CB 
*cb, CPND_EVT *evt,
        send_evt.info.cpd.info.ckpt_created_sections.error = rc;
 
 end:
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
        TRACE_LEAVE();
        return rc;
 }
@@ -3420,7 +3420,7 @@ static uint32_t 
cpnd_evt_proc_nd2nd_ckpt_sect_create(CPND_CB *cb, CPND_EVT *evt,
                        ckpt_data->sec_id.id = NULL;
                        if (id->idLen > 0) {
                                ckpt_data->sec_id.id =
-                                   m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
+                                       (unsigned char 
*)m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
                                memcpy(ckpt_data->sec_id.id, id->id,
                                       ckpt_data->sec_id.idLen);
                        }
@@ -3527,7 +3527,7 @@ static uint32_t 
cpnd_evt_proc_nd2nd_ckpt_sect_delete(CPND_CB *cb, CPND_EVT *evt,
                        ckpt_data.sec_id.id = NULL;
                        if (id->idLen > 0) {
                                ckpt_data.sec_id.id =
-                                   m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
+                                       (unsigned char 
*)m_MMGR_ALLOC_CPND_DEFAULT(id->idLen);
                                memcpy(ckpt_data.sec_id.id, id->id,
                                       ckpt_data.sec_id.idLen);
                        }
@@ -4966,6 +4966,7 @@ static uint32_t cpnd_evt_proc_ckpt_destroy(CPND_CB *cb, 
CPND_EVT *evt,
 {
        uint32_t rc = NCSCC_RC_SUCCESS;
        CPND_CKPT_NODE *cp_node = NULL;
+       TRACE_ENTER();
 
        (void)pthread_mutex_lock(&ckpt_destroy_lock);
        cpnd_ckpt_node_get(cb, evt->info.ckpt_destroy.ckpt_id, &cp_node);
@@ -5229,7 +5230,7 @@ ckpt_replica_create_failed:
 static uint32_t cpnd_evt_proc_ckpt_sect_iter_req(CPND_CB *cb, CPND_EVT *evt,
                                                 CPSV_SEND_INFO *sinfo)
 {
-       uint32_t rc = SA_AIS_OK;
+       SaAisErrorT rc = SA_AIS_OK;
        CPND_CKPT_NODE *cp_node = NULL;
        CPSV_EVT send_evt;
 
@@ -5256,7 +5257,7 @@ agent_rsp:
        send_evt.type = CPSV_EVT_TYPE_CPA;
        send_evt.info.cpa.type = CPA_EVT_ND2A_SEC_ITER_RSP;
        send_evt.info.cpa.info.sec_iter_rsp.error = rc;
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
        TRACE_LEAVE();
        return rc;
 }
@@ -5279,7 +5280,7 @@ static uint32_t cpnd_evt_proc_ckpt_iter_getnext(CPND_CB 
*cb, CPND_EVT *evt,
                                                CPSV_SEND_INFO *sinfo)
 {
 
-       uint32_t rc = NCSCC_RC_SUCCESS;
+       SaAisErrorT rc = SA_AIS_OK;
        CPND_CKPT_NODE *cp_node = NULL;
        CPSV_EVT send_evt;
        SaCkptSectionDescriptorT sect_desc;
@@ -5340,7 +5341,7 @@ agent_rsp:
            evt->info.iter_getnext.iter_id;
        send_evt.info.cpa.info.iter_next_rsp.n_secs_trav = num_secs_trav;
 
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
        TRACE_LEAVE();
        return rc;
 }
@@ -5390,7 +5391,7 @@ end:
        } else
                send_evt.info.cpnd.info.ckpt_nd2nd_getnext_rsp.error = rc;
 
-       rc = cpnd_mds_send_rsp(cb, sinfo, &send_evt);
+       rc = static_cast<SaAisErrorT>(cpnd_mds_send_rsp(cb, sinfo, &send_evt));
        TRACE_LEAVE();
        return rc;
 }
@@ -5681,9 +5682,9 @@ uint32_t cpnd_evt_destroy(CPSV_EVT *evt)
                case CPSV_DATA_ACCESS_RMT_READ_RSP: {
                        int i = 0;
                        if (evt->info.cpnd.info.ckpt_nd2nd_data_rsp
-                               .num_of_elmts != -1) {
+                                       .num_of_elmts != (unsigned int)-1) {
                                for (;
-                                    i < evt->info.cpnd.info.ckpt_nd2nd_data_rsp
+                                    (unsigned int)i < 
evt->info.cpnd.info.ckpt_nd2nd_data_rsp
                                             .num_of_elmts;
                                     i++) {
                                        if ((evt->info.cpnd.info
diff --git a/src/ckpt/ckptnd/cpnd_init.cc b/src/ckpt/ckptnd/cpnd_init.cc
index 2251773..a505441 100644
--- a/src/ckpt/ckptnd/cpnd_init.cc
+++ b/src/ckpt/ckptnd/cpnd_init.cc
@@ -273,7 +273,7 @@ static uint32_t cpnd_lib_init(CPND_CREATE_INFO *info)
                gbl_shm_addr.base_addr =
                    shm_ptr; /* Store base address of shared memory, but not
                                used for any operations as of now */
-               gbl_shm_addr.cli_addr = shm_ptr + sizeof(CPND_SHM_VERSION);
+               gbl_shm_addr.cli_addr = (char *)shm_ptr + 
sizeof(CPND_SHM_VERSION);
                gbl_shm_addr.ckpt_addr =
                    (void *)((char *)gbl_shm_addr.cli_addr +
                             sizeof(CLIENT_HDR) +
@@ -510,6 +510,7 @@ static bool cpnd_clear_mbx(NCSCONTEXT arg, NCSCONTEXT msg)
  *****************************************************************************/
 void cpnd_main_process(CPND_CB *cb)
 {
+       TRACE_ENTER();
        NCS_SEL_OBJ mbx_fd;
        SYSF_MBX mbx = cb->cpnd_mbx;
        CPSV_EVT *evt = NULL;
@@ -631,7 +632,7 @@ static SaAisErrorT cpnd_ntf_init(void)
        TRACE_ENTER();
 
        do {
-               CPND_CB *cb = m_CPND_TAKE_CPND_CB;
+               CPND_CB *cb = (CPND_CB *)m_CPND_TAKE_CPND_CB;
                SaVersionT ntf_version = { 'A', 1, 1 };
                SaNtfHandleT ntfHandle;
                int retries = 5;
@@ -683,7 +684,7 @@ static SaAisErrorT cpnd_clm_init(void)
        m_CPSV_GET_AMF_VER(clm_version);
        SaClmCallbacksT gen_cbk;
 
-       cb = m_CPND_TAKE_CPND_CB;
+       cb = (CPND_CB *)m_CPND_TAKE_CPND_CB;
 
        TRACE_ENTER();
 
@@ -758,7 +759,7 @@ cpnd_clm_initialize_fail:
  *****************************************************************************/
 static void *cpnd_clm_init_thread(void *arg)
 {
-       CPND_CB *cb = m_CPND_TAKE_CPND_CB;
+       CPND_CB *cb = (CPND_CB *)m_CPND_TAKE_CPND_CB;
 
        TRACE_ENTER();
 
diff --git a/src/ckpt/ckptnd/cpnd_main.cc b/src/ckpt/ckptnd/cpnd_main.cc
index 3f95c69..a106e7a 100644
--- a/src/ckpt/ckptnd/cpnd_main.cc
+++ b/src/ckpt/ckptnd/cpnd_main.cc
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
 
        cb_hdl = m_CPND_GET_CB_HDL;
        /* Get the CB from the handle */
-       cpnd_cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
+       cpnd_cb = (CPND_CB *)ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
 
        if (!cpnd_cb) {
                LOG_ER("Handle get failed");
diff --git a/src/ckpt/ckptnd/cpnd_mds.cc b/src/ckpt/ckptnd/cpnd_mds.cc
index b3dc2e2..bcd8c94 100644
--- a/src/ckpt/ckptnd/cpnd_mds.cc
+++ b/src/ckpt/ckptnd/cpnd_mds.cc
@@ -26,9 +26,9 @@
 
 
 *****************************************************************************/
-
 #include "ckpt/ckptnd/cpnd.h"
-
+#include "base/ncs_edu_pub.h"
+#include "ckpt/common/cpsv.h"
 uint32_t cpnd_mds_callback(struct ncsmds_callback_info *info);
 static uint32_t cpnd_mds_enc(CPND_CB *cb, MDS_CALLBACK_ENC_FLAT_INFO *info);
 static uint32_t cpnd_mds_dec(CPND_CB *cb, MDS_CALLBACK_DEC_FLAT_INFO *info);
@@ -43,7 +43,11 @@ static uint32_t cpnd_mds_send_try_again_rsp(CPND_CB *cb, 
CPSV_EVT *pEvt);
 static uint32_t cpsv_ckpt_access_decode(CPSV_CKPT_ACCESS *ckpt_data,
                                        NCS_UBAID *io_uba);
 
-FUNC_DECLARATION(CPSV_EVT);
+
+uint32_t (*cpsv_edp_CPSV_EVT_info)(EDU_HDL * edu_hdl, EDU_TKN * edu_tkn,
+               NCSCONTEXT ptr, uint32_t * ptr_data_len, EDU_BUF_ENV * buf_env,
+               EDP_OP_TYPE op, EDU_ERR * o_err);
+
 
 /* Message Format Verion Tables at CPND */
 MDS_CLIENT_MSG_FORMAT_VER
@@ -288,7 +292,7 @@ uint32_t cpnd_mds_callback(struct ncsmds_callback_info 
*info)
 static uint32_t cpnd_mds_enc(CPND_CB *cb, MDS_CALLBACK_ENC_INFO *enc_info)
 {
        CPSV_EVT *pevt = NULL;
-       EDU_ERR ederror = 0;
+       EDU_ERR ederror = static_cast<EDU_ERR>(0);
        NCS_UBAID *io_uba = enc_info->io_uba;
        uint8_t *pstream = NULL;
        uint32_t rc = NCSCC_RC_SUCCESS;
@@ -338,8 +342,8 @@ static uint32_t cpnd_mds_enc(CPND_CB *cb, 
MDS_CALLBACK_ENC_INFO *enc_info)
                                pstream = ncs_enc_reserve_space(io_uba, 8);
                                if (!pstream)
                                        return m_CPSV_DBG_SINK(
-                                           NCSCC_RC_FAILURE,
-                                           "Memory alloc failed in 
cpnd_mds_enc \n");
+                                                       NCSCC_RC_FAILURE,
+                                                       "Memory alloc failed in 
cpnd_mds_enc \n");
 
                                ncs_encode_32bit(&pstream,
                                                 pevt->type); /* Type */
@@ -360,8 +364,8 @@ static uint32_t cpnd_mds_enc(CPND_CB *cb, 
MDS_CALLBACK_ENC_INFO *enc_info)
                                pstream = ncs_enc_reserve_space(io_uba, 12);
                                if (!pstream)
                                        return m_CPSV_DBG_SINK(
-                                           NCSCC_RC_FAILURE,
-                                           "Memory alloc failed in 
cpnd_mds_enc \n");
+                                                       NCSCC_RC_FAILURE,
+                                                       "Memory alloc failed in 
cpnd_mds_enc \n");
                                ncs_encode_32bit(
                                    &pstream, pevt->type); /* CPSV_EVT Type */
                                ncs_encode_32bit(
@@ -389,8 +393,8 @@ static uint32_t cpnd_mds_enc(CPND_CB *cb, 
MDS_CALLBACK_ENC_INFO *enc_info)
                                pstream = ncs_enc_reserve_space(io_uba, 12);
                                if (!pstream)
                                        return m_CPSV_DBG_SINK(
-                                           NCSCC_RC_FAILURE,
-                                           "Memory alloc failed in 
cpnd_mds_enc \n");
+                                                       NCSCC_RC_FAILURE,
+                                                       "Memory alloc failed in 
cpnd_mds_enc \n");
                                ncs_encode_32bit(
                                    &pstream, pevt->type); /* CPSV_EVT Type */
                                ncs_encode_32bit(
@@ -418,8 +422,8 @@ static uint32_t cpnd_mds_enc(CPND_CB *cb, 
MDS_CALLBACK_ENC_INFO *enc_info)
                                pstream = ncs_enc_reserve_space(io_uba, 12);
                                if (!pstream)
                                        return m_CPSV_DBG_SINK(
-                                           NCSCC_RC_FAILURE,
-                                           "Memory alloc failed in 
cpnd_mds_enc \n");
+                                                       NCSCC_RC_FAILURE,
+                                                       "Memory alloc failed in 
cpnd_mds_enc \n");
                                ncs_encode_32bit(
                                    &pstream, pevt->type); /* CPSV_EVT Type */
                                ncs_encode_32bit(
@@ -455,12 +459,13 @@ static uint32_t cpnd_mds_enc(CPND_CB *cb, 
MDS_CALLBACK_ENC_INFO *enc_info)
        } else {
                TRACE_LEAVE();
                return m_CPSV_DBG_SINK(
-                   NCSCC_RC_FAILURE,
-                   "INVALID MSG FORMAT IN ENCODE FULL\n"); /* Drop The Message
+                               NCSCC_RC_FAILURE,
+                               "INVALID MSG FORMAT IN ENCODE FULL\n"); /* Drop 
The Message
                                                               - Incompatible
                                                               Message Format
                                                               Version */
        }
+
 }
 
 /****************************************************************************\
@@ -510,7 +515,7 @@ uint32_t cpsv_ckpt_access_decode(CPSV_CKPT_ACCESS 
*ckpt_data, NCS_UBAID *io_uba)
        ckpt_data->ckpt_sync.client_hdl = ncs_decode_64bit(&pstream);
        ckpt_data->ckpt_sync.is_ckpt_open = (bool)ncs_decode_32bit(&pstream);
        ckpt_data->ckpt_sync.cpa_sinfo.dest = ncs_decode_64bit(&pstream);
-       ckpt_data->ckpt_sync.cpa_sinfo.stype = ncs_decode_32bit(&pstream);
+       ckpt_data->ckpt_sync.cpa_sinfo.stype = static_cast<MDS_SENDTYPES>( 
ncs_decode_32bit(&pstream));
        ckpt_data->ckpt_sync.cpa_sinfo.to_svc = ncs_decode_32bit(&pstream);
        ckpt_data->ckpt_sync.cpa_sinfo.ctxt.length = ncs_decode_8bit(&pstream);
        ncs_dec_skip_space(io_uba, space);
@@ -537,7 +542,7 @@ static uint32_t cpnd_mds_dec(CPND_CB *cb, 
MDS_CALLBACK_DEC_INFO *dec_info)
 {
 
        CPSV_EVT *msg_ptr = NULL;
-       EDU_ERR ederror = 0;
+       EDU_ERR ederror =static_cast<EDU_ERR>(0);
        uint32_t rc = NCSCC_RC_SUCCESS;
        uint8_t *pstream;
        uint8_t local_data[20];
@@ -566,13 +571,13 @@ static uint32_t cpnd_mds_dec(CPND_CB *cb, 
MDS_CALLBACK_DEC_INFO *dec_info)
                dec_info->o_msg = (NCSCONTEXT)msg_ptr;
                pstream =
                    ncs_dec_flatten_space(dec_info->io_uba, local_data, 12);
-               msg_ptr->type = ncs_decode_32bit(&pstream);
+               msg_ptr->type = 
static_cast<CPSV_EVT_TYPE>(ncs_decode_32bit(&pstream));
                if (msg_ptr->type ==
                    CPSV_EVT_TYPE_CPND) { /* Replaced EDU with encode/decode
                                             Routines for Performance
                                             Improvement */
-                       msg_ptr->info.cpnd.error = ncs_decode_32bit(&pstream);
-                       msg_ptr->info.cpnd.type = ncs_decode_32bit(&pstream);
+                       msg_ptr->info.cpnd.error = 
static_cast<SaAisErrorT>(ncs_decode_32bit(&pstream));
+                       msg_ptr->info.cpnd.type = 
static_cast<CPND_EVT_TYPE>(ncs_decode_32bit(&pstream));
 
                        switch (msg_ptr->info.cpnd.type) {
                        case CPND_EVT_A2ND_CKPT_WRITE: /* Write EVENT */
@@ -631,9 +636,9 @@ static uint32_t cpnd_mds_dec(CPND_CB *cb, 
MDS_CALLBACK_DEC_INFO *dec_info)
                }
                /* For all other Events otherthan Write/Read Call EDU */
                rc = m_NCS_EDU_VER_EXEC(&cb->cpnd_edu_hdl, FUNC_NAME(CPSV_EVT),
-                                       dec_info->io_uba, EDP_OP_TYPE_DEC,
-                                       (CPSV_EVT **)&dec_info->o_msg, &ederror,
-                                       dec_info->i_msg_fmt_ver);
+                                       dec_info->io_uba, EDP_OP_TYPE_DEC,
+                                       (CPSV_EVT **)&dec_info->o_msg, &ederror,
+                                       dec_info->i_msg_fmt_ver);
 
        free:
                if (rc != NCSCC_RC_SUCCESS) {
@@ -646,8 +651,8 @@ static uint32_t cpnd_mds_dec(CPND_CB *cb, 
MDS_CALLBACK_DEC_INFO *dec_info)
                /* Drop The Message - Incompatible Message Format Version */
                LOG_ER("cpnd mds decode failed ");
                return m_CPSV_DBG_SINK(
-                   NCSCC_RC_FAILURE,
-                   "INVALID MSG FORMAT IN DECODE FULL\n"); /* Drop The Message
+                               NCSCC_RC_FAILURE,
+                               "INVALID MSG FORMAT IN DECODE FULL\n"); /* Drop 
The Message
                                                               - Incompatible
                                                               Message Format
                                                               Version */
@@ -668,6 +673,7 @@ static uint32_t cpnd_mds_dec(CPND_CB *cb, 
MDS_CALLBACK_DEC_INFO *dec_info)
 ******************************************************************************/
 static uint32_t cpnd_mds_enc_flat(CPND_CB *cb, MDS_CALLBACK_ENC_FLAT_INFO 
*info)
 {
+       TRACE_ENTER();
        CPSV_EVT *evt = NULL;
        uint32_t rc = NCSCC_RC_SUCCESS;
        NCS_UBAID *uba = info->io_uba;
@@ -705,8 +711,8 @@ static uint32_t cpnd_mds_enc_flat(CPND_CB *cb, 
MDS_CALLBACK_ENC_FLAT_INFO *info)
                /* Drop The Message  Incompatible Message Format Version */
                LOG_CR("cpnd mds enc flat failed");
                return m_CPSV_DBG_SINK(
-                   NCSCC_RC_FAILURE,
-                   "INVALID MSG FORMAT IN ENCODE FLAT\n"); /* Drop The Message
+                               NCSCC_RC_FAILURE,
+                               "INVALID MSG FORMAT IN ENCODE FLAT\n"); /* Drop 
The Message
                                                               - Incompatible
                                                               Message Format
                                                               Version */
@@ -727,6 +733,7 @@ static uint32_t cpnd_mds_enc_flat(CPND_CB *cb, 
MDS_CALLBACK_ENC_FLAT_INFO *info)
 ******************************************************************************/
 static uint32_t cpnd_mds_dec_flat(CPND_CB *cb, MDS_CALLBACK_DEC_FLAT_INFO 
*info)
 {
+       TRACE_ENTER();
        CPSV_EVT *evt = NULL;
        NCS_UBAID *uba = info->io_uba;
        uint32_t rc = NCSCC_RC_SUCCESS;
@@ -764,8 +771,8 @@ static uint32_t cpnd_mds_dec_flat(CPND_CB *cb, 
MDS_CALLBACK_DEC_FLAT_INFO *info)
                LOG_CR("cpnd mds dec flat failed ");
                TRACE_LEAVE();
                return m_CPSV_DBG_SINK(
-                   NCSCC_RC_FAILURE,
-                   "INVALID MSG FORMAT IN DECODE FLAT\n"); /* Drop The Message
+                               NCSCC_RC_FAILURE,
+                               "INVALID MSG FORMAT IN DECODE FLAT\n"); /* Drop 
The Message
                                                               - Incompatible
                                                               Message Format
                                                               Version */
@@ -787,6 +794,7 @@ static uint32_t cpnd_mds_dec_flat(CPND_CB *cb, 
MDS_CALLBACK_DEC_FLAT_INFO *info)
 
 static uint32_t cpnd_mds_rcv(CPND_CB *cb, MDS_CALLBACK_RECEIVE_INFO *rcv_info)
 {
+       TRACE_ENTER();
        uint32_t rc = NCSCC_RC_SUCCESS;
        CPSV_EVT *pEvt = (CPSV_EVT *)rcv_info->i_msg;
        CPND_SYNC_SEND_NODE *node = NULL;
@@ -957,7 +965,7 @@ static uint32_t cpnd_mds_send_try_again_rsp(CPND_CB *cb, 
CPSV_EVT *pEvt)
                break;
        }
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_SEND, pEvt, pEvt->sinfo.dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_SEND, pEvt, pEvt->sinfo.dest);
 
        rc = cpnd_mds_send_rsp(cb, &pEvt->sinfo, &send_evt);
 
@@ -1001,7 +1009,7 @@ uint32_t cpnd_mds_bcast_send(CPND_CB *cb, CPSV_EVT *evt, 
NCSMDS_SVC_ID to_svc)
        info.info.svc_send.i_to_svc = to_svc;
        info.info.svc_send.info.bcast.i_bcast_scope = NCSMDS_SCOPE_INTRANODE;
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_BROADCAST, evt, 0);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_BROADCAST, evt, 0);
 
        res = ncsmds_api(&info);
        return (res);
@@ -1124,7 +1132,7 @@ static uint32_t cpnd_mds_svc_evt(CPND_CB *cb,
        evt->info.cpnd.info.mds_info.role = svc_evt->i_role;
 
        /* Put it in CPND's Event Queue */
-       rc = m_NCS_IPC_SEND(&cb->cpnd_mbx, (NCSCONTEXT)evt, priority);
+       rc = m_NCS_IPC_SEND(&cb->cpnd_mbx, (NCSCONTEXT)evt, 
static_cast<NCS_IPC_PRIORITY>(priority));
        if (rc != NCSCC_RC_SUCCESS) {
                LOG_ER("cpnd ncs ipc send failed");
        }
@@ -1165,7 +1173,7 @@ uint32_t cpnd_mds_send_rsp(CPND_CB *cb, CPSV_SEND_INFO 
*s_info, CPSV_EVT *evt)
 
        /* send the message */
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_SEND, evt, s_info->dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_SEND, evt, s_info->dest);
 
        rc = ncsmds_api(&mds_info);
        if (rc != NCSCC_RC_SUCCESS)
@@ -1218,8 +1226,8 @@ uint32_t cpnd_mds_msg_sync_send(CPND_CB *cb, uint32_t 
to_svc, MDS_DEST to_dest,
 
                m_NCS_LOCK(&cb->cpnd_sync_send_lock, NCS_LOCK_WRITE);
 
-               node = ncs_find_item(&cb->cpnd_sync_send_list, (void *)&to_dest,
-                                    cpnd_match_dest);
+               node = (CPND_SYNC_SEND_NODE 
*)ncs_find_item(&cb->cpnd_sync_send_list, (void *)&to_dest,
+                               cpnd_match_dest);
 
                if (!node) {
                        /* received no sync sends from CPND to which we are
@@ -1255,13 +1263,13 @@ uint32_t cpnd_mds_msg_sync_send(CPND_CB *cb, uint32_t 
to_svc, MDS_DEST to_dest,
 
        /* send the message */
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_SEND, i_evt, to_dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_SEND, i_evt, to_dest);
 
        rc = ncsmds_api(&mds_info);
 
        if (rc == NCSCC_RC_SUCCESS) {
-               *o_evt = mds_info.info.svc_send.info.sndrsp.o_rsp;
-               cpsv_evt_trace("cpnd", CPSV_EVT_RECEIVE, *o_evt, to_dest);
+               *o_evt = (CPSV_EVT *)mds_info.info.svc_send.info.sndrsp.o_rsp;
+               cpsv_evt_trace((char *)"cpnd", CPSV_EVT_RECEIVE, *o_evt, 
to_dest);
        } else {
                TRACE_4("cpnd mds send fail for to_dest:%" PRIu64
                        ",return value:%d",
@@ -1332,7 +1340,7 @@ uint32_t cpnd_mds_msg_send(CPND_CB *cb, uint32_t to_svc, 
MDS_DEST to_dest,
 
        /* send the message */
 
-       cpsv_evt_trace("cpnd", CPSV_EVT_SEND, evt, to_dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_SEND, evt, to_dest);
 
        rc = ncsmds_api(&mds_info);
 
@@ -1400,7 +1408,7 @@ uint32_t cpnd_mds_msg_sync_ack_send(CPND_CB *cb, uint32_t 
to_svc,
        mds_info.info.svc_send.info.sndack.i_to_dest = to_dest;
 
        /* send the message */
-       cpsv_evt_trace("cpnd", CPSV_EVT_SEND, i_evt, to_dest);
+       cpsv_evt_trace((char *)"cpnd", CPSV_EVT_SEND, i_evt, to_dest);
 
        rc = ncsmds_api(&mds_info);
        if (rc != NCSCC_RC_SUCCESS) {
diff --git a/src/ckpt/ckptnd/cpnd_proc.cc b/src/ckpt/ckptnd/cpnd_proc.cc
index 55b6beb..5bfdd18 100644
--- a/src/ckpt/ckptnd/cpnd_proc.cc
+++ b/src/ckpt/ckptnd/cpnd_proc.cc
@@ -500,7 +500,7 @@ uint32_t cpnd_ckpt_replica_create(CPND_CB *cb, 
CPND_CKPT_NODE *cp_node)
                return NCSCC_RC_FAILURE;
        }
 
-       buf = m_MMGR_ALLOC_CPND_DEFAULT(CPND_MAX_REPLICA_NAME_LENGTH);
+       buf = (char *)m_MMGR_ALLOC_CPND_DEFAULT(CPND_MAX_REPLICA_NAME_LENGTH);
        memset(buf, '\0', CPND_MAX_REPLICA_NAME_LENGTH);
        strncpy(buf, cp_node->ckpt_name, CPND_REP_NAME_MAX_CKPT_NAME_LENGTH);
 
@@ -551,7 +551,7 @@ again:
            (uint32_t *)m_MMGR_ALLOC_CPND_DEFAULT(
                sizeof(uint32_t) * cp_node->create_attrib.maxSections);
 
-       for (; sec_cnt < cp_node->create_attrib.maxSections; sec_cnt++)
+       for (; sec_cnt < (signed int)cp_node->create_attrib.maxSections; 
sec_cnt++)
                cp_node->replica_info.shm_sec_mapping[sec_cnt] = 1;
 
        TRACE_LEAVE();
@@ -1338,7 +1338,7 @@ void cpnd_proc_gen_mapping(CPND_CKPT_NODE *cp_node, 
CPSV_CKPT_ACCESS *ckpt_read,
               sizeof(CPSV_ND2A_READ_MAP) * ckpt_read->num_of_elmts);
 
        sec_data = ckpt_read->data;
-       for (iter = 0; iter < ckpt_read->num_of_elmts;
+       for (iter = 0; iter < (signed int)ckpt_read->num_of_elmts;
             iter++, sec_data = sec_data->next) {
                sec_info = cpnd_ckpt_sec_get(cp_node, &sec_data->sec_id);
                if (sec_info == NULL) {
@@ -1400,7 +1400,7 @@ uint32_t cpnd_proc_update_remote(CPND_CB *cb, 
CPND_CKPT_NODE *cp_node,
 {
        CPSV_EVT send_evt;
        CPSV_CPND_ALL_REPL_EVT_NODE *all_repl_evt = NULL;
-       CPSV_CPND_UPDATE_DEST *new = NULL, *head = NULL;
+       CPSV_CPND_UPDATE_DEST *new1 = NULL, *head = NULL;
        uint32_t rc = NCSCC_RC_SUCCESS;
        SaTimeT timeout = 0;
        SaSizeT datasize = 0;
@@ -1447,20 +1447,20 @@ uint32_t cpnd_proc_update_remote(CPND_CB *cb, 
CPND_CKPT_NODE *cp_node,
                                /*Copy the entire dest_list info of ckpt node to
                                 * all_repl_evt dest_list */
                                while (tmp != NULL) {
-                                       new =
+                                       new1 =
                                            m_MMGR_ALLOC_CPND_UPDATE_DEST_INFO;
-                                       if (!new) {
+                                       if (!new1) {
                                                rc = NCSCC_RC_FAILURE;
                                                goto mem_fail;
                                        }
-                                       memset(new, 0,
+                                       memset(new1, 0,
                                               sizeof(CPSV_CPND_UPDATE_DEST));
-                                       new->dest = tmp->dest;
+                                       new1->dest = tmp->dest;
                                        if (head == NULL) {
-                                               head = new;
+                                               head = new1;
                                        } else {
-                                               new->next = head;
-                                               head = new;
+                                               new1->next = head;
+                                               head = new1;
                                        }
                                        tmp = tmp->next;
                                }
@@ -2086,7 +2086,7 @@ void cpnd_cb_dump(void)
        uint32_t cb_hdl = m_CPND_GET_CB_HDL;
 
        /* Get the CB from the handle */
-       cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
+       cb = (CPND_CB *)ncshm_take_hdl(NCS_SERVICE_ID_CPND, cb_hdl);
 
        if (!cb) {
                TRACE_4("cpnd cb take handle failed");
@@ -3005,7 +3005,7 @@ void cpnd_proc_active_down_ckpt_node_del(CPND_CB *cb, 
MDS_DEST mds_dest)
 SaUint32T cpnd_get_scAbsenceAllowed_attr()
 {
        SaUint32T rc_attr_val = 0;
-       char *attribute_names[] = {"scAbsenceAllowed", NULL};
+       char *attribute_names[] = {(char *)"scAbsenceAllowed", NULL};
 
        TRACE_ENTER();
 
diff --git a/src/ckpt/ckptnd/cpnd_res.cc b/src/ckpt/ckptnd/cpnd_res.cc
index 3d69f3f..fa496b6 100644
--- a/src/ckpt/ckptnd/cpnd_res.cc
+++ b/src/ckpt/ckptnd/cpnd_res.cc
@@ -282,7 +282,7 @@ uint32_t cpnd_ckpt_replica_create_res(CPND_CB *cb,
                pSecPtr->sec_id.idLen = sect_hdr.idLen;
                if (pSecPtr->sec_id.idLen != 0) {
                        pSecPtr->sec_id.id =
-                           m_MMGR_ALLOC_CPND_DEFAULT(pSecPtr->sec_id.idLen);
+                               (unsigned char 
*)m_MMGR_ALLOC_CPND_DEFAULT(pSecPtr->sec_id.idLen);
                        if (pSecPtr->sec_id.id == NULL) {
                                TRACE_4(
                                    "cpnd default allocation failed for sec_id 
length");
@@ -390,7 +390,7 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO 
*cpnd_open_req,
        memset(&cpnd_shm_version, '\0', sizeof(cpnd_shm_version));
        cpnd_shm_version.shm_version = CPSV_CPND_SHM_VERSION;
 
-       buffer = m_MMGR_ALLOC_CPND_DEFAULT(total_length);
+       buffer = (char *) m_MMGR_ALLOC_CPND_DEFAULT(total_length);
        if (buffer == NULL) {
                LOG_ER(
                    "cpnd default memory allocation failed in cpnd_open in 
resart shm create");
@@ -456,7 +456,7 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO 
*cpnd_open_req,
                       sizeof(cpnd_shm_version));
 
                gbl_shm_addr.cli_addr =
-                   cpnd_open_req->info.open.o_addr +
+                       (char *)(cpnd_open_req->info.open.o_addr) +
                    sizeof(
                        cpnd_shm_version); /* Starting address of the shared
                                              memory */
@@ -606,7 +606,7 @@ void *cpnd_restart_shm_create(NCS_OS_POSIX_SHM_REQ_INFO 
*cpnd_open_req,
                                        /* OPEN THE SHARED MEMORY ALREADY
                                         * CREATED FOR CHECKPOINT REPLICA */
                                        /* size=cp_node->ckpt_name.length; */
-                                       buf = m_MMGR_ALLOC_CPND_DEFAULT(
+                                       buf = (char *)m_MMGR_ALLOC_CPND_DEFAULT(
                                            CPND_MAX_REPLICA_NAME_LENGTH);
                                        memset(buf, '\0',
                                               CPND_MAX_REPLICA_NAME_LENGTH);
@@ -1618,7 +1618,7 @@ void cpnd_clear_ckpt_info(CPND_CB *cb, CPND_CKPT_NODE 
*cp_node,
 
        /* Update the Next Location in the previous prev_ckpt_info.next as we
         * have to clear the curr ckpt_info */
-       if (cp_node->offset != curr_offset) {
+       if (cp_node->offset != (signed int) curr_offset) {
                memset(&ckpt_hdr, '\0', sizeof(CKPT_HDR));
                m_CPND_CKPTHDR_READ(ckpt_hdr, (char *)cb->shm_addr.ckpt_addr,
                                    0);
@@ -1853,7 +1853,7 @@ static uint32_t cpnd_shm_extended_open(CPND_CB *cb, 
uint32_t flag)
        NCS_OS_POSIX_SHM_REQ_INFO cpnd_open_req;
        memset(&cpnd_open_req, 0, sizeof(cpnd_open_req));
        uint8_t total_length = strlen("CPND_EXTENDED_INFO") + 12;
-       char *buffer = m_MMGR_ALLOC_CPND_DEFAULT(total_length);
+       char *buffer = (char *)m_MMGR_ALLOC_CPND_DEFAULT(total_length);
        if (buffer == NULL) {
                LOG_ER(
                    "cpnd default memory allocation failed in cpnd_open in 
resart shm create");
@@ -1901,9 +1901,9 @@ static uint32_t cpnd_extended_name_lend(SaConstStringT 
value, SaNameT *name)
        }
 
        /* Find memory slot for ckpt_name */
-       CPND_CB *cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, m_CPND_GET_CB_HDL);
+       CPND_CB *cb = (CPND_CB *)ncshm_take_hdl(NCS_SERVICE_ID_CPND, 
m_CPND_GET_CB_HDL);
        TRACE("cb=%p, extended_info=%p", cb, cb->shm_addr.extended_addr);
-       CKPT_EXTENDED_INFO *extended_info = cb->shm_addr.extended_addr;
+       CKPT_EXTENDED_INFO *extended_info = 
static_cast<CKPT_EXTENDED_INFO*>(cb->shm_addr.extended_addr);
        if (!extended_info) {
                /* Logically there is no way for this */
                return NCSCC_RC_FAILURE;
@@ -1945,11 +1945,11 @@ SaConstStringT cpnd_extended_name_borrow(const SaNameT 
*name)
                return osaf_extended_name_borrow(name);
        }
        uint64_t offset = 0;
-       CPND_CB *cb = ncshm_take_hdl(NCS_SERVICE_ID_CPND, m_CPND_GET_CB_HDL);
+       CPND_CB *cb =(CPND_CB *) ncshm_take_hdl(NCS_SERVICE_ID_CPND, 
m_CPND_GET_CB_HDL);
        memcpy(&offset,
               name->_opaque + sizeof(SaConstStringT) / sizeof(SaUint16T),
               sizeof(uint64_t));
-       CKPT_EXTENDED_INFO *extended_info = cb->shm_addr.extended_addr + offset;
+       CKPT_EXTENDED_INFO *extended_info = (CKPT_EXTENDED_INFO 
*)cb->shm_addr.extended_addr + offset;
        return extended_info->ckpt_name;
 }
 
diff --git a/src/ckpt/common/cpsv_evt.c b/src/ckpt/common/cpsv_evt.c
index d897931..936ccc0 100644
--- a/src/ckpt/common/cpsv_evt.c
+++ b/src/ckpt/common/cpsv_evt.c
@@ -27,11 +27,10 @@
 
 ******************************************************************************
 */
-
 #include "ckpt/common/cpsv.h"
 #include "ckpt/agent/cpa_tmr.h"
 #include "base/osaf_extended_name.h"
-
+#include "ckpt/common/cpsv_evt.h"
 FUNC_DECLARATION(CPSV_CKPT_DATA);
 static SaCkptSectionIdT *cpsv_evt_dec_sec_id(NCS_UBAID *i_ub, uint32_t svc_id);
 static uint32_t cpsv_evt_enc_sec_id(NCS_UBAID *o_ub, SaCkptSectionIdT *sec_id);
@@ -2770,7 +2769,7 @@ uint32_t cpsv_evt_dec_flat(EDU_HDL *edu_hdl, NCS_UBAID 
*i_ub, CPSV_EVT *o_evt)
 
 #if ((NCS_CPND == 1) || (NCS_CPD == 1))
 
-uint32_t cpsv_dbg_sink(uint32_t l, char *f, uint32_t code, char *str)
+uint32_t cpsv_dbg_sink(uint32_t l, const char *f, uint32_t code, const char 
*str)
 {
        TRACE("In file %s at line %d ", f, l);
 
diff --git a/src/ckpt/common/cpsv_evt.h b/src/ckpt/common/cpsv_evt.h
index 04c5499..d261672 100644
--- a/src/ckpt/common/cpsv_evt.h
+++ b/src/ckpt/common/cpsv_evt.h
@@ -25,14 +25,16 @@
   This file contains the Enum and datastructure definations for events
   exchanged between CPSv components
 ******************************************************************************/
-
 #ifndef CKPT_COMMON_CPSV_EVT_H_
 #define CKPT_COMMON_CPSV_EVT_H_
-
+#include "ckpt/common/cpsv.h"
+#include "base/osaf_extended_name.h"
 #include <saCkpt.h>
 #include <saCkpt_B_02_03.h>
 #include "base/ncssysf_tmr.h"
-
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*****************************************************************************
  * Event Type of CPSV
  *****************************************************************************/
@@ -941,14 +943,33 @@ void cpsv_evt_trace(char *svc_name, CPSV_EVT_REQUEST 
request, CPSV_EVT *evt,
 
 #if ((NCS_CPND == 1) || (NCS_CPD == 1))
 
-uint32_t cpsv_dbg_sink(uint32_t, char *, uint32_t, char *);
+uint32_t cpsv_dbg_sink(uint32_t, const char *, uint32_t, const char *);
 #define m_CPSV_DBG_SINK(r, s) \
-  cpsv_dbg_sink(__LINE__, __FILE__, (uint32_t)r, (char *)s)
+  cpsv_dbg_sink(__LINE__, __FILE__, (uint32_t)r, (const char *)s)
 #define m_CPSV_DBG_VOID cpsv_dbg_sink(__LINE__, __FILE__, 1)
 #else
 
 #define m_CPSV_DBG_SINK(r, s) r
 #define m_CPSV_DBG_VOID
 #endif
+void cpsv_evt_trace(char *svc_name, CPSV_EVT_REQUEST request, CPSV_EVT *evt,
+                    MDS_DEST mds_dest);
+uint32_t cpsv_ckpt_data_decode(CPSV_CKPT_DATA **data, NCS_UBAID *io_uba);
+uint32_t cpsv_evt_enc_flat(EDU_HDL *edu_hdl, CPSV_EVT *i_evt, NCS_UBAID *o_ub);
+uint32_t cpsv_data_access_rsp_encode(CPSV_ND2A_DATA_ACCESS_RSP *data_rsp,
+                                     NCS_UBAID *io_uba,
+                                     MDS_CLIENT_MSG_FORMAT_VER o_msg_fmt_ver);
+uint32_t cpsv_ckpt_access_encode(CPSV_CKPT_ACCESS *ckpt_data, NCS_UBAID 
*io_uba);
+uint32_t cpsv_data_access_rsp_decode(CPSV_ND2A_DATA_ACCESS_RSP *data_rsp,
+                                     NCS_UBAID *io_uba,
+                                     MDS_CLIENT_MSG_FORMAT_VER i_msg_fmt_ver);
+uint32_t cpsv_d2nd_ckpt_create_2_decode(CPSV_D2ND_CKPT_CREATE *create_data,
+                                        NCS_UBAID *io_uba);
+uint32_t cpsv_refcnt_ckptid_decode(CPSV_A2ND_REFCNTSET *pdata,
+                                   NCS_UBAID *io_uba);
 
+#ifdef __cplusplus
+}
+
+#endif
 #endif  // CKPT_COMMON_CPSV_EVT_H_
-- 
2.7.4



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

Reply via email to