osaf/libs/common/cpsv/cpsv_evt.c | 16 ++++++++--------
osaf/services/saf/cpsv/cpd/cpd_proc.c | 2 +-
osaf/services/saf/cpsv/cpnd/cpnd_mds.c | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/osaf/libs/common/cpsv/cpsv_evt.c b/osaf/libs/common/cpsv/cpsv_evt.c
--- a/osaf/libs/common/cpsv/cpsv_evt.c
+++ b/osaf/libs/common/cpsv/cpsv_evt.c
@@ -215,8 +215,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char *
case CPND_EVT_MDS_INFO:
{
CPSV_MDS_INFO *info = &evt->info.cpnd.info.mds_info;
- snprintf(o_evt_str, len, "CPND_EVT_MDS_INFO(dest=0x%lX,
svc=%s(%u) - %s(%u))",
- info->dest,
+ snprintf(o_evt_str, len,
"CPND_EVT_MDS_INFO(dest=0x%llX, svc=%s(%u) - %s(%u))",
+ (unsigned long long)info->dest,
info->svc_id == NCSMDS_SVC_ID_CPA ? "CPA" :
info->svc_id == NCSMDS_SVC_ID_CPND ? "CPND" :
info->svc_id == NCSMDS_SVC_ID_CPD ? "CPD" :
"OTHER",
@@ -289,8 +289,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char *
char sec_id[MAX_SEC_ID_LEN] = {0};
cpsv_convert_sec_id_to_string(sec_id,
info->sec_attri.sectionId);
- snprintf(o_evt_str, len, "[%llu]
CPND_EVT_A2ND_CKPT_SECT_CREATE(sec_id=%s, mdest=0x%lX)",
- info->ckpt_id, sec_id, info->agent_mdest);
+ snprintf(o_evt_str, len, "[%llu]
CPND_EVT_A2ND_CKPT_SECT_CREATE(sec_id=%s, mdest=0x%llX)",
+ info->ckpt_id, sec_id, (unsigned long
long)info->agent_mdest);
break;
}
case CPND_EVT_A2ND_CKPT_SECT_DELETE:
@@ -689,8 +689,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char *
char sec_id[MAX_SEC_ID_LEN] = {0};
cpsv_convert_sec_id_to_string(sec_id, &info->sec_id);
- snprintf(o_evt_str, len, "[%llu]
CPA_EVT_ND2A_SEC_CREATE_RSP(err=%u, sec_id=%s, mdest=%lX)",
- info->ckpt_id, info->error, sec_id,
info->agent_mdest);
+ snprintf(o_evt_str, len, "[%llu]
CPA_EVT_ND2A_SEC_CREATE_RSP(err=%u, sec_id=%s, mdest=%llX)",
+ info->ckpt_id, info->error, sec_id, (unsigned
long long)info->agent_mdest);
break;
}
case CPA_EVT_ND2A_SEC_DELETE_RSP:
@@ -783,8 +783,8 @@ char* cpsv_evt_str(CPSV_EVT *evt, char *
case CPD_EVT_MDS_INFO:
{
CPSV_MDS_INFO *info = &evt->info.cpd.info.mds_info;
- snprintf(o_evt_str, len, "CPD_EVT_MDS_INFO(dest=0x%lX,
svc=%s(%u) - %s(%u))",
- info->dest,
+ snprintf(o_evt_str, len, "CPD_EVT_MDS_INFO(dest=0x%llX,
svc=%s(%u) - %s(%u))",
+ (unsigned long long)info->dest,
info->svc_id == NCSMDS_SVC_ID_CPA ? "CPA" :
info->svc_id == NCSMDS_SVC_ID_CPND ? "CPND" :
info->svc_id == NCSMDS_SVC_ID_CPD ? "CPD" :
"OTHER",
diff --git a/osaf/services/saf/cpsv/cpd/cpd_proc.c
b/osaf/services/saf/cpsv/cpd/cpd_proc.c
--- a/osaf/services/saf/cpsv/cpd/cpd_proc.c
+++ b/osaf/services/saf/cpsv/cpd/cpd_proc.c
@@ -342,7 +342,7 @@ uint32_t cpd_ckpt_db_entry_update(CPD_CB
goto ckpt_node_add_fail;
}
if (reploc_info && create_reploc_node) {
- TRACE_4("reploc node add for non-collocated on node
0x%X - ckpt_id:%llx", m_NCS_NODE_ID_FROM_MDS_DEST(cpnd_dest), ckpt_id);
+ TRACE_4("reploc node add for non-collocated on node
0x%X - ckpt_id:%llx", m_NCS_NODE_ID_FROM_MDS_DEST(*cpnd_dest), ckpt_id);
proc_rc =
cpd_ckpt_reploc_node_add(&cb->ckpt_reploc_tree, reploc_info, cb->ha_state,
cb->immOiHandle);
if (proc_rc != NCSCC_RC_SUCCESS) {
/* goto reploc_node_add_fail; */
diff --git a/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
b/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
--- a/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
+++ b/osaf/services/saf/cpsv/cpnd/cpnd_mds.c
@@ -894,7 +894,7 @@ static uint32_t cpnd_mds_svc_evt(CPND_CB
case NCSMDS_UP:
cb->is_cpd_up = true;
cb->cpd_mdest_id = svc_evt->i_dest;
- TRACE_4("cpnd cpd service came up - cpd_mdest_id =
0x%lX", cb->cpd_mdest_id);
+ TRACE_4("cpnd cpd service came up - cpd_mdest_id =
0x%llX", (unsigned long long)cb->cpd_mdest_id);
break;
case NCSMDS_NO_ACTIVE:
------------------------------------------------------------------------------
Full-scale, agent-less Infrastructure Monitoring from a single dashboard
Integrate with 40+ ManageEngine ITSM Solutions for complete visibility
Physical-Virtual-Cloud Infrastructure monitoring from one console
Real user monitoring with APM Insights and performance trend reports
Learn More http://pubads.g.doubleclick.net/gampad/clk?id=247754911&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
