r3510 - in trunk/libminisip/source: subsystem_contacts subsystem_media/rtp subsystem_media/soundcard subsystem_signaling/sdp subsystem_signaling/sip
erik at minisip.org
erik at minisip.org
Thu Nov 22 17:35:40 CET 2007
Author: erik
Date: 2007-11-22 17:35:40 +0100 (Thu, 22 Nov 2007)
New Revision: 3510
Modified:
trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx
trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_CNAME.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_EMAIL.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_LOC.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_NAME.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_NOTE.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_PHONE.cxx
trunk/libminisip/source/subsystem_media/rtp/SDES_TOOL.cxx
trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderO.cxx
trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderT.cxx
trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx
Log:
libminisip:
* Fix a few warnings in msvc
Modified: trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx
===================================================================
--- trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_contacts/LdapPhoneBookIo.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -99,7 +99,7 @@
try {
contact = entry->getAttrValueString(label);
- } catch( LdapException &e ) {
+ } catch( LdapException & ) {
continue;
}
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportRR.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -83,7 +83,7 @@
int RtcpReportRR::get_n_report_blocks(){
- return reception_blocks.size();
+ return (int)reception_blocks.size();
}
RtcpReportReceptionBlock &RtcpReportRR::get_reception_block(int i){
Modified: trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/RtcpReportSR.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -92,7 +92,7 @@
}
int RtcpReportSR::get_n_report_blocks(){
- return reception_blocks.size();
+ return (int)reception_blocks.size();
}
RtcpReportReceptionBlock &RtcpReportSR::get_reception_block(int i){
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_CNAME.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_CNAME.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_CNAME.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+cname.length()/*+npad*/;
+ return 2+(int)cname.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_EMAIL.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_EMAIL.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_EMAIL.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+email.length()/*+npad*/;
+ return 2+(int)email.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_LOC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_LOC.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_LOC.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+loc.length()/*+npad*/;
+ return 2+(int)loc.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_NAME.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_NAME.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_NAME.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+name.length()/*+npad*/;
+ return 2+(int)name.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_NOTE.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_NOTE.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_NOTE.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+note.length()/*+npad*/;
+ return 2+(int)note.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_PHONE.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_PHONE.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_PHONE.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+phone.length()/*+npad*/;
+ return 2+(int)phone.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/rtp/SDES_TOOL.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/rtp/SDES_TOOL.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/rtp/SDES_TOOL.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -58,7 +58,7 @@
// int npad = 4-((2+cname.length())%4);
// if (npad==4)
// npad=0;
- return 2+tool.length()/*+npad*/;
+ return 2+(int)tool.length()/*+npad*/;
}
#ifdef DEBUG_OUTPUT
Modified: trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_media/soundcard/SoundDevice.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -54,7 +54,9 @@
if( devideId.substr( 0, 5 ) == "wave:" ){
return new WaveSoundDevice( devideId.substr( 5, string::npos ) );
}
+
#endif
+ return NULL;
}
SoundDevice::SoundDevice( string device ):openedRecord(false),openedPlayback(false){
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderC.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -39,11 +39,11 @@
using namespace std;
SdpHeaderC::SdpHeaderC(string buildFrom):SdpHeader(SDP_HEADER_TYPE_C, 4){
- int len = buildFrom.length();
+ size_t len = buildFrom.length();
if (buildFrom.substr(0,2)!="c="){
std::cerr << "ERROR: Contact sdp header is not starting with <c=>"<< std::endl;
}
- unsigned i=2;
+ size_t i=2;
while ( buildFrom[i]==' ' && i<len )
i++;
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderM.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -45,13 +45,13 @@
SdpHeaderM::SdpHeaderM(string buildFrom) : SdpHeader(SDP_HEADER_TYPE_M, 8){
- int len = buildFrom.length();
+ size_t len = buildFrom.length();
if (buildFrom.substr(0,2)!="m="){
#ifdef DEBUG_OUTPUT
cerr << "ERROR: Origin sdp header is not starting with <m=>"<< endl;
#endif
}
- unsigned i=2;
+ size_t i=2;
while (buildFrom[i]==' ' && i<len)
i++;
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderO.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderO.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderO.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -41,13 +41,13 @@
using namespace std;
SdpHeaderO::SdpHeaderO(string buildFrom):SdpHeader(SDP_HEADER_TYPE_O, 2){
- int len = buildFrom.length();
+ size_t len = buildFrom.length();
if (buildFrom.substr(0,2)!="o="){
#ifdef DEBUG_OUTPUT
std::cerr << "ERROR: Origin sdp header is not starting with <o=>:"<<buildFrom<< std::endl;
#endif
}
- unsigned i=2;
+ size_t i=2;
while ( buildFrom[i]==' ' && i<len )
i++;
Modified: trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderT.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderT.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_signaling/sdp/SdpHeaderT.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -42,14 +42,14 @@
using namespace std;
SdpHeaderT::SdpHeaderT(string buildFrom):SdpHeader(SDP_HEADER_TYPE_T, 5){
- int len=buildFrom.length();
+ size_t len=buildFrom.length();
if (buildFrom.substr(0,2)!="t="){
#ifdef DEBUG_OUTPUT
std::cerr << "ERROR: Origin sdp header is not starting with <o=>"<< std::endl;
#endif
}
- unsigned i=2;
+ size_t i=2;
while ( buildFrom[i]==' ' && i<len )
i++;
Modified: trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx 2007-11-22 16:16:11 UTC (rev 3509)
+++ trunk/libminisip/source/subsystem_signaling/sip/Sip.cxx 2007-11-22 16:35:40 UTC (rev 3510)
@@ -319,7 +319,7 @@
try{
sipstack->startTcpServer();
- }catch(NetworkException &e){
+ }catch(NetworkException &){
merr << "Error: Failed to create TCP socket"<<endl;
}
@@ -336,7 +336,7 @@
#endif
try{
sipstack->startTlsServer();
- }catch(NetworkException &e){
+ }catch(NetworkException &){
merr << "Error: Failed to create TLS socket"<<endl;
}
More information about the Minisip-devel
mailing list