Browse code

b/f: core: use %zu instead where possible replaced %lu and c-style cast with %zu in cases of STL container size()

Szókovács Róbert authored on 21/10/2013 12:30:00
Showing 4 changed files
... ...
@@ -845,8 +845,7 @@ void AmB2BMedia::replaceConnectionAddress(AmSdp &parser_sdp, bool a_leg,
845 845
   if (it != parser_sdp.media.end()) {
846 846
     // FIXME: create new streams here?
847 847
     WARN("trying to relay SDP with more media lines than "
848
-	 "relay streams initialized (%lu)\n", 
849
-	 (unsigned long)(audio.size()+relay_streams.size()));
848
+	 "relay streams initialized (%zu)\n",audio.size()+relay_streams.size());
850 849
   }
851 850
 
852 851
   DBG("replaced connection address in SDP with %s:%s.\n",
... ...
@@ -84,10 +84,10 @@ AmB2BSession::~AmB2BSession()
84 84
 {
85 85
   clearRtpReceiverRelay();
86 86
 
87
-  DBG("relayed_req.size() = %u\n",(unsigned int)relayed_req.size());
87
+  DBG("relayed_req.size() = %zu\n",relayed_req.size());
88 88
 
89 89
   map<int,AmSipRequest>::iterator it = recvd_req.begin();
90
-  DBG("recvd_req.size() = %u\n",(unsigned int)recvd_req.size());
90
+  DBG("recvd_req.size() = %zu\n",recvd_req.size());
91 91
   for(;it != recvd_req.end(); ++it){
92 92
     DBG("  <%i,%s>\n",it->first,it->second.method.c_str());
93 93
   }
... ...
@@ -707,7 +707,7 @@ void AmBasicSipDialog::dump()
707 707
 {
708 708
   DBG("callid = %s\n",callid.c_str());
709 709
   DBG("local_tag = %s\n",local_tag.c_str());
710
-  DBG("uac_trans.size() = %u\n",(unsigned int)uac_trans.size());
710
+  DBG("uac_trans.size() = %zu\n",uac_trans.size());
711 711
   if(uac_trans.size()){
712 712
     for(TransMap::iterator it = uac_trans.begin();
713 713
 	it != uac_trans.end(); it++){
... ...
@@ -715,7 +715,7 @@ void AmBasicSipDialog::dump()
715 715
       DBG("    cseq = %i; method = %s\n",it->first,it->second.method.c_str());
716 716
     }
717 717
   }
718
-  DBG("uas_trans.size() = %u\n",(unsigned int)uas_trans.size());
718
+  DBG("uas_trans.size() = %zu\n",uas_trans.size());
719 719
   if(uas_trans.size()){
720 720
     for(TransMap::iterator it = uas_trans.begin();
721 721
 	it != uas_trans.end(); it++){
... ...
@@ -239,8 +239,7 @@ void AmEventDispatcher::dump()
239 239
     for (size_t i=0;i<EVENT_DISPATCHER_BUCKETS;i++) {
240 240
       queues_mut[i].lock();
241 241
       if(!queues[i].empty()) {
242
-	DBG("queues[%lu].size() = %lu",
243
-	    (unsigned long)i,(unsigned long)queues[i].size());
242
+	DBG("queues[%zu].size() = %zu",i,queues[i].size());
244 243
 	for(EvQueueMapIter it = queues[i].begin();
245 244
 	    it != queues[i].end(); it++){
246 245
 	  DBG("\t%s -> %p\n",it->first.c_str(),it->second.q);
... ...
@@ -250,8 +249,7 @@ void AmEventDispatcher::dump()
250 249
 
251 250
       id_lookup_mut[i].lock();
252 251
       if(!id_lookup[i].empty()) {
253
-	DBG("id_lookup[%lu].size() = %lu",
254
-	    (unsigned long)i,(unsigned long)id_lookup[i].size());
252
+	DBG("id_lookup[%zu].size() = %zu",i,id_lookup[i].size());
255 253
       }
256 254
       id_lookup_mut[i].unlock();
257 255
     }