Module: sems Branch: master Commit: 0106dfae3b1edcd810e49ac66814d89449014542 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=0106dfae3b1edcd810e49ac66814d89449014542
Author: Szókovács Róbert <[email protected]> Committer: Szókovács Róbert <[email protected]> Date: Mon Oct 21 14:30:00 2013 +0200 b/f: core: use %zu instead where possible replaced %lu and c-style cast with %zu in cases of STL container size() --- core/AmB2BMedia.cpp | 3 +-- core/AmB2BSession.cpp | 4 ++-- core/AmBasicSipDialog.cpp | 4 ++-- core/AmEventDispatcher.cpp | 6 ++---- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/core/AmB2BMedia.cpp b/core/AmB2BMedia.cpp index 8868ae5..2c06e16 100644 --- a/core/AmB2BMedia.cpp +++ b/core/AmB2BMedia.cpp @@ -845,8 +845,7 @@ void AmB2BMedia::replaceConnectionAddress(AmSdp &parser_sdp, bool a_leg, if (it != parser_sdp.media.end()) { // FIXME: create new streams here? WARN("trying to relay SDP with more media lines than " - "relay streams initialized (%lu)\n", - (unsigned long)(audio.size()+relay_streams.size())); + "relay streams initialized (%zu)\n",audio.size()+relay_streams.size()); } DBG("replaced connection address in SDP with %s:%s.\n", diff --git a/core/AmB2BSession.cpp b/core/AmB2BSession.cpp index a6003eb..b9ba0e9 100644 --- a/core/AmB2BSession.cpp +++ b/core/AmB2BSession.cpp @@ -84,10 +84,10 @@ AmB2BSession::~AmB2BSession() { clearRtpReceiverRelay(); - DBG("relayed_req.size() = %u\n",(unsigned int)relayed_req.size()); + DBG("relayed_req.size() = %zu\n",relayed_req.size()); map<int,AmSipRequest>::iterator it = recvd_req.begin(); - DBG("recvd_req.size() = %u\n",(unsigned int)recvd_req.size()); + DBG("recvd_req.size() = %zu\n",recvd_req.size()); for(;it != recvd_req.end(); ++it){ DBG(" <%i,%s>\n",it->first,it->second.method.c_str()); } diff --git a/core/AmBasicSipDialog.cpp b/core/AmBasicSipDialog.cpp index 14d63ba..a5d38ff 100644 --- a/core/AmBasicSipDialog.cpp +++ b/core/AmBasicSipDialog.cpp @@ -707,7 +707,7 @@ void AmBasicSipDialog::dump() { DBG("callid = %s\n",callid.c_str()); DBG("local_tag = %s\n",local_tag.c_str()); - DBG("uac_trans.size() = %u\n",(unsigned int)uac_trans.size()); + DBG("uac_trans.size() = %zu\n",uac_trans.size()); if(uac_trans.size()){ for(TransMap::iterator it = uac_trans.begin(); it != uac_trans.end(); it++){ @@ -715,7 +715,7 @@ void AmBasicSipDialog::dump() DBG(" cseq = %i; method = %s\n",it->first,it->second.method.c_str()); } } - DBG("uas_trans.size() = %u\n",(unsigned int)uas_trans.size()); + DBG("uas_trans.size() = %zu\n",uas_trans.size()); if(uas_trans.size()){ for(TransMap::iterator it = uas_trans.begin(); it != uas_trans.end(); it++){ diff --git a/core/AmEventDispatcher.cpp b/core/AmEventDispatcher.cpp index 70f407c..1febda8 100644 --- a/core/AmEventDispatcher.cpp +++ b/core/AmEventDispatcher.cpp @@ -239,8 +239,7 @@ void AmEventDispatcher::dump() for (size_t i=0;i<EVENT_DISPATCHER_BUCKETS;i++) { queues_mut[i].lock(); if(!queues[i].empty()) { - DBG("queues[%lu].size() = %lu", - (unsigned long)i,(unsigned long)queues[i].size()); + DBG("queues[%zu].size() = %zu",i,queues[i].size()); for(EvQueueMapIter it = queues[i].begin(); it != queues[i].end(); it++){ DBG("\t%s -> %p\n",it->first.c_str(),it->second.q); @@ -250,8 +249,7 @@ void AmEventDispatcher::dump() id_lookup_mut[i].lock(); if(!id_lookup[i].empty()) { - DBG("id_lookup[%lu].size() = %lu", - (unsigned long)i,(unsigned long)id_lookup[i].size()); + DBG("id_lookup[%zu].size() = %zu",i,id_lookup[i].size()); } id_lookup_mut[i].unlock(); } _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
