osaf/libs/core/mds/mds_c_db.c | 4 ++--
osaf/libs/core/mds/mds_main.c | 4 ++--
osaf/services/saf/immsv/immnd/ImmModel.cc | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/osaf/libs/core/mds/mds_c_db.c b/osaf/libs/core/mds/mds_c_db.c
--- a/osaf/libs/core/mds/mds_c_db.c
+++ b/osaf/libs/core/mds/mds_c_db.c
@@ -2349,7 +2349,7 @@ MDS_PROCESS_INFO *mds_process_info_get(M
int mds_process_info_add(MDS_PROCESS_INFO *info)
{
- TRACE_ENTER2("dest:%lx, pid:%d", info->mds_dest, info->pid);
+ TRACE_ENTER2("dest:%"PRIu64", pid:%d", info->mds_dest, info->pid);
info->patnode.key_info = (uint8_t *)&info->mds_dest;
int rc = ncs_patricia_tree_add(&process_info_db,
(NCS_PATRICIA_NODE *)&info->patnode);
@@ -2358,7 +2358,7 @@ int mds_process_info_add(MDS_PROCESS_INF
int mds_process_info_del(MDS_PROCESS_INFO *info)
{
- TRACE_ENTER2("dest:%lx, pid:%d", info->mds_dest, info->pid);
+ TRACE_ENTER2("dest:%"PRIu64", pid:%d", info->mds_dest, info->pid);
int rc = ncs_patricia_tree_del(&process_info_db,
(NCS_PATRICIA_NODE *)&info->patnode);
return rc;
diff --git a/osaf/libs/core/mds/mds_main.c b/osaf/libs/core/mds/mds_main.c
--- a/osaf/libs/core/mds/mds_main.c
+++ b/osaf/libs/core/mds/mds_main.c
@@ -149,7 +149,7 @@ static void mds_register_callback(int fd
}
MDS_DEST mds_dest = ncs_decode_64bit(&p);
- TRACE("mds: received %d from %lx, pid %d", type, mds_dest, creds->pid);
+ TRACE("mds: received %d from %"PRIu64", pid %d", type, mds_dest,
creds->pid);
osaf_mutex_lock_ordie(&gl_mds_library_mutex);
@@ -165,7 +165,7 @@ static void mds_register_callback(int fd
osafassert(rc == NCSCC_RC_SUCCESS);
} else {
/* this happens in clients that uses both OM and OI */
- TRACE("dest %lx already exist", mds_dest);
+ TRACE("dest %"PRIu64" already exist", mds_dest);
// just update credentials
info->uid = creds->uid;
info->pid = creds->pid;
diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -11927,7 +11927,7 @@ ImmModel::cleanTheBasement(InvocVector&
for(ci2=sSearchReqContinuationMap.begin();
ci2!=sSearchReqContinuationMap.end();
++ci2) {
- if(now - ci2->second.mCreateTime >= ci2->second.mTimeout) {
+ if(now - ci2->second.mCreateTime >= (int)ci2->second.mTimeout) {
TRACE_5("Timeout on Search continuation %llu", ci2->first);
searchReqs.push_back(ci2->first);
}
@@ -11969,13 +11969,13 @@ ImmModel::cleanTheBasement(InvocVector&
uint32_t oi_timeout = ((*i3)->mState == IMM_CCB_CRITICAL) ?
DEFAULT_TIMEOUT_SEC : max_oi_timeout;
if(((*i3)->mWaitStartTime &&
- (now - (*i3)->mWaitStartTime >= oi_timeout)) ||
+ (now - (*i3)->mWaitStartTime >= (int)oi_timeout)) ||
((*i3)->mPbeRestartId)) {
if((*i3)->mPbeRestartId) {
oi_timeout = 0;
TRACE_5("PBE restarted id:%u with ccb:%u in critical",
(*i3)->mPbeRestartId, (*i3)->mId);
- } else if(now - (*i3)->mWaitStartTime >= max_oi_timeout) {
+ } else if(now - (*i3)->mWaitStartTime >= (int)max_oi_timeout) {
oi_timeout = 0;
TRACE_5("CCB %u timeout while waiting on implementer
reply",
(*i3)->mId);
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
