From 93696934b25344aa5d14a5dd0ffc5b3ecb2abb9b Mon Sep 17 00:00:00 2001 From: Peter Olsson Date: Thu, 23 Jan 2014 12:21:41 +0100 Subject: [PATCH] Silence more compiler warnings --- libs/broadvoice/src/libbroadvoice.2012.vcxproj | 6 +++++- libs/win32/flite/flite.2012.vcxproj | 4 ++-- libs/win32/json/libjson.2012.vcxproj | 4 ++-- libs/win32/libjpeg/libjpeg.2012.vcxproj | 1 + libs/win32/libmp3lame/libmp3lame.2012.vcxproj | 6 +++--- libs/win32/mpg123/libmpg123.2012.vcxproj | 2 +- libs/win32/openssl/libeay32.2012.vcxproj | 4 ++-- libs/win32/openssl/openssl.2012.vcxproj | 4 ++-- libs/win32/openssl/ssleay32.2012.vcxproj | 4 ++-- libs/win32/xmlrpc-c/xmlparse.2012.vcxproj | 4 ++-- libs/win32/xmlrpc-c/xmltok.2012.vcxproj | 4 ++-- src/mod/applications/mod_commands/mod_commands.c | 2 +- src/mod/applications/mod_conference/mod_conference.c | 4 ++-- src/mod/applications/mod_curl/mod_curl.c | 2 +- src/mod/applications/mod_esf/mod_esf.c | 2 +- .../mod_nibblebill/mod_nibblebill.2012.vcxproj | 8 ++++++-- src/mod/applications/mod_redis/mod_redis.2012.vcxproj | 2 +- src/mod/applications/mod_redis/mod_redis.c | 2 +- .../mod_pocketsphinx/mod_pocketsphinx.2012.vcxproj | 3 ++- src/mod/codecs/mod_isac/isac.c | 4 ++-- src/mod/codecs/mod_silk/mod_silk.2012.vcxproj | 3 ++- .../endpoints/mod_dingaling/mod_dingaling.2012.vcxproj | 3 ++- .../win32/gsmlib.2012.vcxproj | 4 ++++ src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj | 6 +++++- src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp | 2 +- src/mod/endpoints/mod_gsmopen/win_iconv.c | 6 +++--- src/mod/endpoints/mod_rtmp/rtmp.c | 4 ++-- src/mod/endpoints/mod_skinny/mod_skinny.c | 2 +- src/mod/endpoints/mod_skypopen/mod_skypopen.2012.vcxproj | 6 ++++-- .../formats/mod_tone_stream/mod_tone_stream.2012.vcxproj | 6 ++++-- src/mod/languages/mod_v8/src/jsmain.cpp | 6 +++--- src/mod/xml_int/mod_xml_rpc/ws.c | 4 ++-- 32 files changed, 74 insertions(+), 50 deletions(-) diff --git a/libs/broadvoice/src/libbroadvoice.2012.vcxproj b/libs/broadvoice/src/libbroadvoice.2012.vcxproj index a01905aa7a..bf65fc7163 100644 --- a/libs/broadvoice/src/libbroadvoice.2012.vcxproj +++ b/libs/broadvoice/src/libbroadvoice.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -84,6 +84,7 @@ MultiThreadedDebugDLL Level4 CompileAsC + 4244;%(DisableSpecificWarnings) true @@ -98,6 +99,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H;%(PreprocessorDefinitions) MultiThreadedDLL Level4 + 4244;%(DisableSpecificWarnings) true @@ -120,6 +122,7 @@ EnableFastChecks MultiThreadedDebugDLL CompileAsC + 4244;%(DisableSpecificWarnings) true @@ -137,6 +140,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;BROADVOICE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_TGMATH_H;%(PreprocessorDefinitions) MultiThreadedDLL Level4 + 4244;%(DisableSpecificWarnings) true diff --git a/libs/win32/flite/flite.2012.vcxproj b/libs/win32/flite/flite.2012.vcxproj index b02fb49880..d69896fd68 100644 --- a/libs/win32/flite/flite.2012.vcxproj +++ b/libs/win32/flite/flite.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -78,7 +78,7 @@ EnableFastChecks MultiThreadedDebugDLL Level4 - 4100;4057;4706;%(DisableSpecificWarnings) + 4305;4090;4018;4701;4054;4055;4133;4127;4702;4996;4244;4100;4057;4706;%(DisableSpecificWarnings) diff --git a/libs/win32/json/libjson.2012.vcxproj b/libs/win32/json/libjson.2012.vcxproj index 3e4e865b50..21fb08793e 100644 --- a/libs/win32/json/libjson.2012.vcxproj +++ b/libs/win32/json/libjson.2012.vcxproj @@ -79,7 +79,7 @@ EnableFastChecks MultiThreadedDebugDLL Level3 - 4244;4996;%(DisableSpecificWarnings) + 4018;4244;4996;%(DisableSpecificWarnings) @@ -106,7 +106,7 @@ MultiThreadedDLL true Level3 - 4244;4996;%(DisableSpecificWarnings) + 4018;4244;4996;%(DisableSpecificWarnings) diff --git a/libs/win32/libjpeg/libjpeg.2012.vcxproj b/libs/win32/libjpeg/libjpeg.2012.vcxproj index 34253c1aad..d27c9ed818 100644 --- a/libs/win32/libjpeg/libjpeg.2012.vcxproj +++ b/libs/win32/libjpeg/libjpeg.2012.vcxproj @@ -201,6 +201,7 @@ false Disabled 4267;%(DisableSpecificWarnings) + MultiThreadedDebugDLL Windows diff --git a/libs/win32/libmp3lame/libmp3lame.2012.vcxproj b/libs/win32/libmp3lame/libmp3lame.2012.vcxproj index 2fdcbb61d0..822f988021 100644 --- a/libs/win32/libmp3lame/libmp3lame.2012.vcxproj +++ b/libs/win32/libmp3lame/libmp3lame.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -69,7 +69,7 @@ - /GAy /QIfdiv /QI0f %(AdditionalOptions) + /GAy %(AdditionalOptions) MaxSpeed .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) @@ -92,7 +92,7 @@ X64 - /GAy /QIfdiv /QI0f %(AdditionalOptions) + /GAy %(AdditionalOptions) MaxSpeed .;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) diff --git a/libs/win32/mpg123/libmpg123.2012.vcxproj b/libs/win32/mpg123/libmpg123.2012.vcxproj index 19fdc598ea..c72a669d8d 100644 --- a/libs/win32/mpg123/libmpg123.2012.vcxproj +++ b/libs/win32/mpg123/libmpg123.2012.vcxproj @@ -307,7 +307,7 @@ MultiThreadedDLL false false - StreamingSIMDExtensions + NotSet Precise false Level3 diff --git a/libs/win32/openssl/libeay32.2012.vcxproj b/libs/win32/openssl/libeay32.2012.vcxproj index 7fdb5c8b89..ae276a866a 100644 --- a/libs/win32/openssl/libeay32.2012.vcxproj +++ b/libs/win32/openssl/libeay32.2012.vcxproj @@ -76,8 +76,8 @@ <_ProjectFileVersion>10.0.30319.1 true true - true - true + false + false $(PlatformName)\libeay32\$(Configuration)\ $(PlatformName)\libeay32\$(Configuration)\ $(PlatformName)\libeay32\$(Configuration)\ diff --git a/libs/win32/openssl/openssl.2012.vcxproj b/libs/win32/openssl/openssl.2012.vcxproj index 724c90c160..3796388c02 100644 --- a/libs/win32/openssl/openssl.2012.vcxproj +++ b/libs/win32/openssl/openssl.2012.vcxproj @@ -70,9 +70,9 @@ <_ProjectFileVersion>10.0.30319.1 true - true + false true - true + false diff --git a/libs/win32/openssl/ssleay32.2012.vcxproj b/libs/win32/openssl/ssleay32.2012.vcxproj index d48b571665..b76afa5ba5 100644 --- a/libs/win32/openssl/ssleay32.2012.vcxproj +++ b/libs/win32/openssl/ssleay32.2012.vcxproj @@ -74,9 +74,9 @@ <_ProjectFileVersion>10.0.30319.1 true - true + false true - true + false $(PlatformName)\ssleay32\$(Configuration)\ $(PlatformName)\ssleay32\$(Configuration)\ $(PlatformName)\ssleay32\$(Configuration)\ diff --git a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj index fbd1fe4587..8dc7a0d927 100644 --- a/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj +++ b/libs/win32/xmlrpc-c/xmlparse.2012.vcxproj @@ -95,7 +95,7 @@ $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 true @@ -137,7 +137,7 @@ popd $(XMLRPCDir)lib\expat\xmltok;$(XMLRPCDir)lib\expat\xmlwf;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 true diff --git a/libs/win32/xmlrpc-c/xmltok.2012.vcxproj b/libs/win32/xmlrpc-c/xmltok.2012.vcxproj index 79592f57b4..fa8186cfbb 100644 --- a/libs/win32/xmlrpc-c/xmltok.2012.vcxproj +++ b/libs/win32/xmlrpc-c/xmltok.2012.vcxproj @@ -139,7 +139,7 @@ %(AdditionalIncludeDirectories) NDEBUG;XML_NS;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 true @@ -166,7 +166,7 @@ %(AdditionalIncludeDirectories) NDEBUG;XML_NS;WIN32;_WINDOWS;XML_DTD;_LIB;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 true diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c index 57b4e758e7..4c872e5c23 100644 --- a/src/mod/applications/mod_commands/mod_commands.c +++ b/src/mod/applications/mod_commands/mod_commands.c @@ -1373,7 +1373,7 @@ SWITCH_STANDARD_API(expand_function) { char *expanded; char *dup; - char *arg; + char *arg = NULL; char *mycmd; switch_status_t status; const char *p; diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 23423d737b..fc9fad6af7 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -4019,7 +4019,7 @@ static void member_add_file_data(conference_member_t *member, int16_t *data, swi switch_change_sln_volume(file_frame, (uint32_t)file_sample_len, member->volume_out_level); } - for (i = 0; i < file_sample_len; i++) { + for (i = 0; i < (int)file_sample_len; i++) { if (member->fnode->mux) { sample = data[i] + file_frame[i]; switch_normalize_to_16bit(sample); @@ -8417,7 +8417,7 @@ SWITCH_STANDARD_APP(conference_function) } /* wait for them if neccessary */ - if (strlen(pin_buf) < maxpin) { + if ((int)strlen(pin_buf) < maxpin) { char *buf = pin_buf + strlen(pin_buf); char term = '\0'; diff --git a/src/mod/applications/mod_curl/mod_curl.c b/src/mod/applications/mod_curl/mod_curl.c index 7d62342c4a..fd648c4b43 100644 --- a/src/mod/applications/mod_curl/mod_curl.c +++ b/src/mod/applications/mod_curl/mod_curl.c @@ -583,7 +583,7 @@ http_sendfile_app_done: #define HTTP_SENDFILE_SYNTAX " [nopost|postparam1=foo&postparam2=bar... [event|stream|both|none [identifier ]]]" SWITCH_STANDARD_API(http_sendfile_function) { - switch_status_t status; + switch_status_t status = SWITCH_STATUS_FALSE; switch_bool_t new_memory_pool = SWITCH_FALSE; char *argv[10] = { 0 }, *argv2[10] = { 0 }; int argc = 0, argc2 = 0; diff --git a/src/mod/applications/mod_esf/mod_esf.c b/src/mod/applications/mod_esf/mod_esf.c index d8abbb5bcd..102d6ee210 100644 --- a/src/mod/applications/mod_esf/mod_esf.c +++ b/src/mod/applications/mod_esf/mod_esf.c @@ -130,7 +130,7 @@ void dec_serno(void) SWITCH_STANDARD_APP(bcast_function) { switch_channel_t *channel = switch_core_session_get_channel(session); - switch_socket_t *socket, *polycom_socket = NULL; + switch_socket_t *socket = NULL, *polycom_socket = NULL; switch_sockaddr_t *audio_addr = NULL, *control_packet_addr = NULL, *polycom_addr = NULL, *local_addr = NULL; switch_frame_t *read_frame = NULL; switch_status_t status; diff --git a/src/mod/applications/mod_nibblebill/mod_nibblebill.2012.vcxproj b/src/mod/applications/mod_nibblebill/mod_nibblebill.2012.vcxproj index 85df16fec1..3589f64957 100644 --- a/src/mod/applications/mod_nibblebill/mod_nibblebill.2012.vcxproj +++ b/src/mod/applications/mod_nibblebill/mod_nibblebill.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -68,6 +68,10 @@ <_ProjectFileVersion>10.0.30319.1 + + NativeMinimumRules.ruleset + false + %(PreprocessorDefinitions) @@ -101,7 +105,7 @@ %(PreprocessorDefinitions) - true + false false diff --git a/src/mod/applications/mod_redis/mod_redis.2012.vcxproj b/src/mod/applications/mod_redis/mod_redis.2012.vcxproj index 916d8ee5ec..08127494ae 100644 --- a/src/mod/applications/mod_redis/mod_redis.2012.vcxproj +++ b/src/mod/applications/mod_redis/mod_redis.2012.vcxproj @@ -123,7 +123,7 @@ _CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions) - 4706;4306;4996;6340;6246;6011;6387;%(DisableSpecificWarnings) + 4389;4706;4306;4996;6340;6246;6011;6387;%(DisableSpecificWarnings) false diff --git a/src/mod/applications/mod_redis/mod_redis.c b/src/mod/applications/mod_redis/mod_redis.c index e579013ee5..515e96d30a 100755 --- a/src/mod/applications/mod_redis/mod_redis.c +++ b/src/mod/applications/mod_redis/mod_redis.c @@ -266,7 +266,7 @@ SWITCH_LIMIT_RESET(limit_reset_redis) const char *key = uuids[i] + hostnamelen; char *value; - if (strlen(uuids[i]) <= hostnamelen) { + if ((int)strlen(uuids[i]) <= hostnamelen) { continue; /* Sanity check */ } diff --git a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2012.vcxproj b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2012.vcxproj index 9b4ce7bee3..58db0d5129 100644 --- a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2012.vcxproj +++ b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -92,6 +92,7 @@ true Windows MachineX86 + false if not exist "$(OutDir)grammar\model\communicator" xcopy "$(SolutionDir)libs\Communicator_semi_40.cd_semi_6000\*.*" "$(OutDir)..\grammar\model\communicator" /C /D /Y /S /I diff --git a/src/mod/codecs/mod_isac/isac.c b/src/mod/codecs/mod_isac/isac.c index 2199d571f9..6c03726fca 100644 --- a/src/mod/codecs/mod_isac/isac.c +++ b/src/mod/codecs/mod_isac/isac.c @@ -2636,8 +2636,8 @@ WebRtc_Word16 WebRtcIsac_SetEncSampRate( { ISACUBStruct* instUB = &(instISAC->instUB); ISACLBStruct* instLB = &(instISAC->instLB); - double bottleneckLB; - double bottleneckUB; + double bottleneckLB = 0; + double bottleneckUB = 0; WebRtc_Word32 bottleneck = instISAC->bottleneck; WebRtc_Word16 codingMode = instISAC->codingMode; WebRtc_Word16 frameSizeMs = instLB->ISACencLB_obj.new_framelength / (FS / 1000); diff --git a/src/mod/codecs/mod_silk/mod_silk.2012.vcxproj b/src/mod/codecs/mod_silk/mod_silk.2012.vcxproj index 85b6633e82..4beb873f77 100644 --- a/src/mod/codecs/mod_silk/mod_silk.2012.vcxproj +++ b/src/mod/codecs/mod_silk/mod_silk.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -73,6 +73,7 @@ %(RootDir)%(Directory)..\..\..\..\libs\silk\interface;%(AdditionalIncludeDirectories) + /analyze:stacksize65535 false diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.2012.vcxproj b/src/mod/endpoints/mod_dingaling/mod_dingaling.2012.vcxproj index ab076891d8..4b3b2cfd6c 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.2012.vcxproj +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.2012.vcxproj @@ -1,4 +1,4 @@ - + @@ -121,6 +121,7 @@ %(RootDir)%(Directory)..\..\..\..\libs\libdingaling\src;%(AdditionalIncludeDirectories) + 4718;6340;6246;6011;6387;%(DisableSpecificWarnings) $(ProjectDir)..\..\..\..\libs\libdingaling\$(OutDir);$(ProjectDir)..\..\..\..\libs\iksemel\$(OutDir);%(AdditionalLibraryDirectories) diff --git a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj index c574a6c08e..607c07b215 100644 --- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj +++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/win32/gsmlib.2012.vcxproj @@ -101,6 +101,7 @@ Level3 true /wd4290 /wd4996 %(AdditionalOptions) + 4101;4244;4554;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) @@ -108,6 +109,7 @@ true + /ignore:4221 %(AdditionalOptions) true @@ -126,6 +128,7 @@ true EditAndContinue /wd4290 /wd4996 %(AdditionalOptions) + 4101;4244;4554;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) @@ -135,6 +138,7 @@ true false %(IgnoreSpecificDefaultLibraries) + /ignore:4221 %(AdditionalOptions) true diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj index 26964aed97..e6f6312c33 100644 --- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj +++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2012.vcxproj @@ -73,7 +73,7 @@ false $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ - AllRules.ruleset + NativeMinimumRules.ruleset AllRules.ruleset @@ -86,6 +86,9 @@ + + false + gsmlib\gsmlib-1.10-patched-13ubuntu;libctb-0.16\include;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src\msvc;%(RootDir)%(Directory)..\..\..\..\libs\spandsp\src;%(RootDir)%(Directory)..\..\..\..\libs\tiff-4.0.2\libtiff;%(RootDir)%(Directory)..\..\..\..\libs\jpeg-8d;%(AdditionalIncludeDirectories) @@ -95,6 +98,7 @@ Level4 false 4554;4324;4389;4244;4267;6340;6246;6011;6387;%(DisableSpecificWarnings) + false false diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp index 8c011fec1c..2258cf2675 100644 --- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp +++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp @@ -1707,7 +1707,7 @@ static switch_status_t load_config(int reload_type) static switch_status_t chat_send(switch_event_t *message_event) { - char *user, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL; + char *user = NULL, *host, *f_user = NULL, *f_host = NULL, *f_resource = NULL; private_t *tech_pvt = NULL; int i = 0, found = 0; diff --git a/src/mod/endpoints/mod_gsmopen/win_iconv.c b/src/mod/endpoints/mod_gsmopen/win_iconv.c index 94c8d4a1e7..4eb5433196 100644 --- a/src/mod/endpoints/mod_gsmopen/win_iconv.c +++ b/src/mod/endpoints/mod_gsmopen/win_iconv.c @@ -1510,7 +1510,7 @@ static int utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize) { int codepage = cv->codepage; - uint wc; + uint wc = 0; /* swap endian: 12000 <-> 12001 */ if (cv->mode & UNICODE_MODE_SWAPPED) @@ -1752,8 +1752,8 @@ iso2022jp_wctomb(csconv_t *cv, ushort *wbuf, int wbufsize, uchar *buf, int bufsi HRESULT hr; DWORD dummy = 0; int len; - int esc_len; - int cs; + int esc_len = 0; + int cs = 0; int shift; int i; diff --git a/src/mod/endpoints/mod_rtmp/rtmp.c b/src/mod/endpoints/mod_rtmp/rtmp.c index 7f5db9d553..cebcec244d 100644 --- a/src/mod/endpoints/mod_rtmp/rtmp.c +++ b/src/mod/endpoints/mod_rtmp/rtmp.c @@ -601,7 +601,7 @@ switch_status_t rtmp_send_message(rtmp_session_t *rsession, uint8_t amfnumber, u /* Find out what is the smallest header we can use */ if (!(flags & MSG_FULLHEADER) && stream_id > 0 && state->stream_id == stream_id && timestamp >= state->ts) { - if (state->type == type && state->origlen == len) { + if (state->type == type && state->origlen == (int)len) { if (state->ts == timestamp) { /* Type 3: no header! */ hdrsize = 1; @@ -930,7 +930,7 @@ switch_status_t rtmp_handle_data(rtmp_session_t *rsession) switch_mutex_lock(rsession->tech_pvt->readbuf_mutex); - if (rsession->tech_pvt->maxlen && switch_buffer_inuse(rsession->tech_pvt->readbuf) > rsession->tech_pvt->maxlen * 40) { + if (rsession->tech_pvt->maxlen && switch_buffer_inuse(rsession->tech_pvt->readbuf) > (switch_size_t)(rsession->tech_pvt->maxlen * 40)) { rsession->tech_pvt->over_size++; } else { rsession->tech_pvt->over_size = 0; diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c index 0e1e700264..eaba2fb215 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.c +++ b/src/mod/endpoints/mod_skinny/mod_skinny.c @@ -108,7 +108,7 @@ static char active_lines_sql[] = char *skinny_expand_textid(const char *str) { char *tmp; - int i; + switch_size_t i; /* Look for \200, if found, next character indicates string id */ char match = (char) 128; diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.2012.vcxproj b/src/mod/endpoints/mod_skypopen/mod_skypopen.2012.vcxproj index c4df5721e5..6ce2cbb070 100644 --- a/src/mod/endpoints/mod_skypopen/mod_skypopen.2012.vcxproj +++ b/src/mod/endpoints/mod_skypopen/mod_skypopen.2012.vcxproj @@ -133,7 +133,8 @@ /analyze:stacksize65535 /analyze:stacksize65535 /analyze:stacksize65535 - /analyze:stacksize65535 + + 4305;4306;28193;4244;4267;4324;6340;6246;6011;6387;%(DisableSpecificWarnings) @@ -143,7 +144,8 @@ /analyze:stacksize32768 /analyze:stacksize32768 /analyze:stacksize32768 - /analyze:stacksize32768 + + diff --git a/src/mod/formats/mod_tone_stream/mod_tone_stream.2012.vcxproj b/src/mod/formats/mod_tone_stream/mod_tone_stream.2012.vcxproj index 08a5a347eb..8e00439833 100644 --- a/src/mod/formats/mod_tone_stream/mod_tone_stream.2012.vcxproj +++ b/src/mod/formats/mod_tone_stream/mod_tone_stream.2012.vcxproj @@ -100,7 +100,8 @@ - /analyze:stacksize32768 + + false @@ -115,7 +116,8 @@ - /analyze:stacksize32768 + + false diff --git a/src/mod/languages/mod_v8/src/jsmain.cpp b/src/mod/languages/mod_v8/src/jsmain.cpp index 4185d9a6cd..f173e4747f 100644 --- a/src/mod/languages/mod_v8/src/jsmain.cpp +++ b/src/mod/languages/mod_v8/src/jsmain.cpp @@ -270,7 +270,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN global->Set(String::NewFromUtf8(isolate, "require"), FunctionTemplate::New(isolate, Include)); global->Set(String::NewFromUtf8(isolate, "log"), FunctionTemplate::New(isolate, Log)); - for (int i = 0; i < extenderFunctions->size(); i++) { + for (size_t i = 0; i < extenderFunctions->size(); i++) { js_function_t *proc = (*extenderFunctions)[i]; global->Set(String::NewFromUtf8(isolate, proc->name), FunctionTemplate::New(isolate, proc->func)); } @@ -286,12 +286,12 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN Context::Scope context_scope(context); // Register all plugins. - for (int i = 0; i < extenderClasses->size(); i++) { + for (size_t i = 0; i < extenderClasses->size(); i++) { JSBase::Register(isolate, (*extenderClasses)[i]); } // Register all instances. - for (int i = 0; i < extenderInstances->size(); i++) { + for (size_t i = 0; i < extenderInstances->size(); i++) { registered_instance_t *inst = (*extenderInstances)[i]; inst->obj->RegisterInstance(isolate, inst->name, inst->auto_destroy); } diff --git a/src/mod/xml_int/mod_xml_rpc/ws.c b/src/mod/xml_int/mod_xml_rpc/ws.c index 4ab65749fc..7247ddb4ba 100644 --- a/src/mod/xml_int/mod_xml_rpc/ws.c +++ b/src/mod/xml_int/mod_xml_rpc/ws.c @@ -289,14 +289,14 @@ issize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes) if (readError) { // printf("292 Read Error %s\n", readError); - xmlrpc_strfree(readError); + free((void *)readError); return 0; } r = conn->buffersize - conn->bufferpos; } - if (r <= bytes) { + if (r <= (issize_t)bytes) { memcpy(data, conn->buffer.b + conn->bufferpos, r); // ConnReadInit(conn); conn->bufferpos = conn->buffersize;