FS-7966: fix more msvc 2015 build warnings.

diff --git a/libs/esl/src/esl.2015.vcxproj b/libs/esl/src/esl.2015.vcxproj
index 9a7d2978d7976434d266fa23dc5426974429d07a..b35f24a25c78cd69c2b81c3b1b4de7c0ccef65d7 100644 (file)
--- a/libs/esl/src/esl.2015.vcxproj
+++ b/libs/esl/src/esl.2015.vcxproj
@@ -80,7 +80,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28253;28252;6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>true</EnablePREfast>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -97,7 +97,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28253;28252;6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>true</EnablePREfast>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -108,7 +108,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28253;28252;6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>true</EnablePREfast>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
@@ -122,7 +122,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28253;28252;6031;4267;4244;4706;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>true</EnablePREfast>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r

diff --git a/libs/libdingaling/libdingaling.2015.vcxproj b/libs/libdingaling/libdingaling.2015.vcxproj
index 1c4683b9169c2a2fc03f54052821998bcdedc649..e0502213306f33f1e786475c72d038223cde7991 100644 (file)
--- a/libs/libdingaling/libdingaling.2015.vcxproj
+++ b/libs/libdingaling/libdingaling.2015.vcxproj
@@ -137,7 +137,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'">\r
@@ -161,7 +161,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -184,7 +184,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -207,7 +207,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
@@ -219,7 +219,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <WarningLevel>Level4</WarningLevel>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'">\r
@@ -237,7 +237,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
@@ -264,7 +264,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4718;4456;4457;4701;4702;4703;4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>libapr-1.lib;libaprutil-1.lib;iksemel.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r

diff --git a/libs/libteletone/libteletone.2015.vcxproj b/libs/libteletone/libteletone.2015.vcxproj
index 5a69746dc5f18951629e3ea473f608a6623fe1af..e7faadecdec4a4254aaf9f44cf869de54cf4e721 100644 (file)
--- a/libs/libteletone/libteletone.2015.vcxproj
+++ b/libs/libteletone/libteletone.2015.vcxproj
@@ -81,6 +81,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <EnablePREfast>true</EnablePREfast>\r
+      <DisableSpecificWarnings>28252;28253</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OptimizeReferences>false</OptimizeReferences>\r
@@ -103,6 +104,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <EnablePREfast>true</EnablePREfast>\r
+      <DisableSpecificWarnings>28252;28253</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <OptimizeReferences>false</OptimizeReferences>\r
@@ -120,6 +122,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <EnablePREfast>true</EnablePREfast>\r
+      <DisableSpecificWarnings>28252;28253</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -136,6 +139,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <EnablePREfast>true</EnablePREfast>\r
+      <DisableSpecificWarnings>28252;28253</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

diff --git a/src/include/switch_log.h b/src/include/switch_log.h
index e2244ac51e53e7c00c1fbde96a546049bc7f63c5..62a9e42f154bdabd8bc7f899e9f6c29d98346cfd 100644 (file)
--- a/src/include/switch_log.h
+++ b/src/include/switch_log.h
@@ -141,7 +141,7 @@ SWITCH_DECLARE(switch_status_t) switch_log_unbind_logger(_In_ switch_log_functio
 SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(_In_z_ const char *str);
 
 SWITCH_DECLARE(uint32_t) switch_log_str2mask(_In_z_ const char *str);
-#define switch_log_check_mask(_mask, _level) (_mask & (1 << _level))
+#define switch_log_check_mask(_mask, _level) (_mask & ((size_t)1 << _level))
 
 
 SWITCH_DECLARE(switch_log_node_t *) switch_log_node_dup(const switch_log_node_t *node);

diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c
index 610ed1caaff3b8a5515b8214ca63664ecec0fabb..3722365397521e22c9cf8827253afb7aecb3f1b8 100644 (file)
--- a/src/mod/applications/mod_avmd/mod_avmd.c
+++ b/src/mod/applications/mod_avmd/mod_avmd.c
@@ -137,7 +137,7 @@ static void init_avmd_session_data(avmd_session_t *avmd_session,  switch_core_se
 {
        /*! This is a worst case sample rate estimate */
        avmd_session->rate = 48000;
-       INIT_CIRC_BUFFER(&avmd_session->b, BEEP_LEN(avmd_session->rate), FRAME_LEN(avmd_session->rate), fs_session);
+       INIT_CIRC_BUFFER(&avmd_session->b, (size_t)BEEP_LEN(avmd_session->rate), (size_t)FRAME_LEN(avmd_session->rate), fs_session);
 
        avmd_session->session = fs_session;
        avmd_session->pos = 0;

diff --git a/src/mod/applications/mod_enum/mod_enum.c b/src/mod/applications/mod_enum/mod_enum.c
index d7cc9e5156220295d028deaa53425888791efda2..42126f30094a09c683299c38795d52159228788a 100644 (file)
--- a/src/mod/applications/mod_enum/mod_enum.c
+++ b/src/mod/applications/mod_enum/mod_enum.c
@@ -280,7 +280,7 @@ static void free_results(enum_record_t ** results)
 
 static ldns_rdf *ldns_rdf_new_addr_frm_str(const char *str)
 {
-       ldns_rdf *a;
+       ldns_rdf *a = NULL;
 
        ldns_str2rdf_a(&a, str);
 

diff --git a/src/mod/applications/mod_expr/exprval.c b/src/mod/applications/mod_expr/exprval.c
index b0efaa8453265a1e9fca46db604379f917c56af8..6939c9567fb72a2efe7f0541ac389e15f56134ae 100644 (file)
--- a/src/mod/applications/mod_expr/exprval.c
+++ b/src/mod/applications/mod_expr/exprval.c
@@ -213,12 +213,15 @@ int exprValListGetAddress(exprValList * vlist, char *name, EXPRTYPE ** addr)
        exprVal *cur;
        int result;
 
-       if (vlist == NULL || addr == NULL)
+       if (addr == NULL)
                return EXPR_ERROR_NULLPOINTER;
 
        /* Not found yet */
        *addr = NULL;
 
+       if (vlist == NULL)
+               return EXPR_ERROR_NULLPOINTER;
+
        if (name == NULL || name[0] == '\0')
                return EXPR_ERROR_NOTFOUND;
 

diff --git a/src/mod/applications/mod_fsv/mod_fsv.c b/src/mod/applications/mod_fsv/mod_fsv.c
index 860d8b7ae2c71d00072fad5e92a7a19d928faf34..c709458dd96e07fd32bfec4b779d7e7d40a29dfe 100644 (file)
--- a/src/mod/applications/mod_fsv/mod_fsv.c
+++ b/src/mod/applications/mod_fsv/mod_fsv.c
@@ -950,7 +950,7 @@ end:
 
 static switch_status_t fsv_file_write(switch_file_handle_t *handle, void *data, size_t *len)
 {
-       uint32_t datalen = *len * sizeof(int16_t);
+       uint32_t datalen = (uint32_t)(*len * sizeof(int16_t));
        size_t size;
        switch_status_t status;
        int16_t *xdata = data;

diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.2015.vcxproj b/src/mod/applications/mod_spandsp/mod_spandsp.2015.vcxproj
index 25cc04caec432be6ab1bc7ec2c03d4768a478126..d519a7bcec8317cfa7dfbf00c840141e5ffc8482 100644 (file)
--- a/src/mod/applications/mod_spandsp/mod_spandsp.2015.vcxproj
+++ b/src/mod/applications/mod_spandsp/mod_spandsp.2015.vcxproj
@@ -89,7 +89,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -107,7 +107,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -123,7 +123,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -141,7 +141,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;6031;4456;4024;4047;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj b/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj
index 2f567679fb3bc127f7b910132bfeceaaaff8f399..7ff672d2140cfa660538be99a3173a4bed8d2522 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.2015.vcxproj
@@ -73,6 +73,7 @@
       <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libdingaling\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4718;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>\r
@@ -90,6 +91,7 @@
       <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libdingaling\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4718;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>/NODEFAULTLIB:LIMBCTD %(AdditionalOptions)</AdditionalOptions>\r
@@ -105,6 +107,7 @@
       <AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\libdingaling\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4718;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\libs\libdingaling\$(OutDir);$(ProjectDir)..\..\..\..\libs\iksemel\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/src/mod/endpoints/mod_rtc/mod_rtc.2015.vcxproj b/src/mod/endpoints/mod_rtc/mod_rtc.2015.vcxproj
index 95a4b5954c541550bbb439871ae9a292d8275093..ed07ba9eb3a5057ff50429ceffe6ad74fadf383d 100644 (file)
--- a/src/mod/endpoints/mod_rtc/mod_rtc.2015.vcxproj
+++ b/src/mod/endpoints/mod_rtc/mod_rtc.2015.vcxproj
@@ -72,6 +72,7 @@
     <ClCompile>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4189;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -86,6 +87,7 @@
     <ClCompile>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4189;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -98,6 +100,7 @@
     <ClCompile>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4189;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
@@ -112,6 +115,7 @@
     <ClCompile>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
+      <DisableSpecificWarnings>4189;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r

diff --git a/src/mod/endpoints/mod_rtmp/handshake.h b/src/mod/endpoints/mod_rtmp/handshake.h
index 5d513ecd289eece16ac941265bbaf8deb4912525..f33ad9fd085d1480e77446d2bd30ed6d6a756f5a 100644 (file)
--- a/src/mod/endpoints/mod_rtmp/handshake.h
+++ b/src/mod/endpoints/mod_rtmp/handshake.h
@@ -27,6 +27,11 @@
 #ifndef _RTMP_VIDEO_H
 #define _RTMP_VIDEO_H
 
+#include <assert.h>
+#include <string.h>
+#ifdef WIN32
+#include <windows.h>
+#endif
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
@@ -149,7 +154,7 @@ static void HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t
        unsigned int digestLen;
        HMAC_CTX ctx;
 
-       HMAC_setup(ctx, key, keylen);
+       HMAC_setup(ctx, key, (int)keylen);
        HMAC_crunch(ctx, message, messageLen);
        HMAC_finish(ctx, digest, digestLen);
 
@@ -603,7 +608,7 @@ static int ReadN(void * user_data, void * out_buffer, size_t size)
 
        memcpy(out_buffer, helper->r_buf + helper->r_pos, len);
        helper->r_pos += len;
-       return len;
+       return (int)len;
 }
 
 static int WriteN(void * user_data, void * buffer, size_t size)
@@ -615,7 +620,7 @@ static int WriteN(void * user_data, void * buffer, size_t size)
 
        memcpy(helper->w_buf + helper->w_pos, buffer, len);
        helper->w_pos += len;
-       return len;
+       return (int)len;
 }
 
 static int SHandShake0(handshake_helper_t * r)

diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
index d696a1973dd396703aeb2bc376a619b49bb483fc..0abae49fb903c77217108e33dfb29d051e7f6c9c 100644 (file)
--- a/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
+++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.2015.vcxproj
@@ -96,7 +96,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -114,7 +114,7 @@
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -132,7 +132,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r
@@ -149,7 +149,7 @@
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4189;4456;4221;4127;6001;6011;6385;6244;6259;4090;4306;4244;4100;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <EnablePREfast>false</EnablePREfast>\r
     </ClCompile>\r
     <Link>\r

diff --git a/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj b/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
index 7d2aad693206fd0224aba49e25a5d901ebc709cf..bbadaa5a50ce113cfad540089526aaf8c0d7676e 100644 (file)
--- a/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
+++ b/src/mod/endpoints/mod_skypopen/mod_skypopen.2015.vcxproj
@@ -75,7 +75,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>rpcrt4.lib  "..\..\..\..\libs\spandsp\src\Win32\Debug\libtiff.lib" "..\..\..\..\Win32\Debug\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>\r
@@ -91,7 +91,7 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DisableSpecificWarnings>4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28183;28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>rpcrt4.lib  "..\..\..\..\libs\spandsp\src\x64\Debug\libtiff.lib" "..\..\..\..\x64\Debug\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>\r
@@ -105,7 +105,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>rpcrt4.lib "..\..\..\..\libs\spandsp\src\Win32\Release\libtiff.lib" "..\..\..\..\Win32\Release\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>\r
@@ -119,7 +119,7 @@
       <AdditionalIncludeDirectories>%(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)</AdditionalIncludeDirectories>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
-      <DisableSpecificWarnings>4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>28252;28253;4456;6031;4324;6340;6246;6011;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalOptions>rpcrt4.lib "..\..\..\..\libs\spandsp\src\x64\Release\libtiff.lib" "..\..\..\..\x64\Release\libspandsp.lib" %(AdditionalOptions)</AdditionalOptions>\r

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast.c b/src/mod/endpoints/mod_verto/mcast/mcast.c
index 9da4088ccd50087dd6270471792251be7f3ae079..722a3d75ca370dde81e42bfb8634a256e9130f9a 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast.c
+++ b/src/mod/endpoints/mod_verto/mcast/mcast.c
@@ -67,7 +67,7 @@ int mcast_socket_create(const char *host, int16_t port, mcast_handle_t *handle,
                family = AF_INET6;
        }
        
-       if ((!(flags & MCAST_SEND) && !(flags & MCAST_RECV)) || (handle->sock = socket(family, SOCK_DGRAM, 0)) <= 0 ) {
+       if ((!(flags & MCAST_SEND) && !(flags & MCAST_RECV)) || (handle->sock = (int)socket(family, SOCK_DGRAM, 0)) <= 0 ) {
                return -1;
        }
 
@@ -203,9 +203,9 @@ ssize_t mcast_socket_send(mcast_handle_t *handle, void *data, size_t datalen)
        }
 
        if (handle->family == AF_INET6) {
-               return sendto(handle->sock, data, datalen, 0, (struct sockaddr *) &handle->send_addr6, sizeof(handle->send_addr6));
+               return sendto(handle->sock, data, (int)datalen, 0, (struct sockaddr *) &handle->send_addr6, sizeof(handle->send_addr6));
        } else {
-               return sendto(handle->sock, data, datalen, 0, (struct sockaddr *) &handle->send_addr, sizeof(handle->send_addr));
+               return sendto(handle->sock, data, (int)datalen, 0, (struct sockaddr *) &handle->send_addr, sizeof(handle->send_addr));
        }
 }
 
@@ -227,8 +227,8 @@ ssize_t mcast_socket_recv(mcast_handle_t *handle, void *data, size_t datalen, in
        }
 
        if (handle->family == AF_INET6) {
-               return recvfrom(handle->sock, data, datalen, 0, (struct sockaddr *) &handle->recv_addr6, &addrlen);
+               return recvfrom(handle->sock, data, (int)datalen, 0, (struct sockaddr *) &handle->recv_addr6, &addrlen);
        } else {
-               return recvfrom(handle->sock, data, datalen, 0, (struct sockaddr *) &handle->recv_addr, &addrlen);
+               return recvfrom(handle->sock, data, (int)datalen, 0, (struct sockaddr *) &handle->recv_addr, &addrlen);
        }
 }

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
index f087baf343ac10e9c123b206030d232acb38f9c3..f4b3d74f30683fcdcfa3a9082d8fc2a98eb84e5a 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
+++ b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
@@ -55,7 +55,7 @@ int McastHandle::send(const char *data)
 
 char *McastHandle::recv(int ms)
 {
-       int r;
+       ssize_t r;
 
        if ((r = mcast_socket_recv(&handle, NULL, 0, ms)) > 0) {
                *((char *)handle.buffer + r) = '\0';

diff --git a/src/mod/endpoints/mod_verto/mod_verto.c b/src/mod/endpoints/mod_verto/mod_verto.c
index 3781d4728511b3abcb5148dad95aeac6e68715b3..7d0d0031033cbfc3bd6949cccb3a31ce58dad583 100644 (file)
--- a/src/mod/endpoints/mod_verto/mod_verto.c
+++ b/src/mod/endpoints/mod_verto/mod_verto.c
@@ -1416,7 +1416,7 @@ static uint8_t *http_stream_read(switch_stream_handle_t *handle, int *len)
                return NULL;
        }
 
-       *len = r->bytes_buffered - r->bytes_read;
+       *len = (int)(r->bytes_buffered - r->bytes_read);
 
        if (*len > 0) { // we already read part of the body
                uint8_t *data = (uint8_t *)wsh->buffer + r->bytes_read;
@@ -1429,10 +1429,10 @@ static uint8_t *http_stream_read(switch_stream_handle_t *handle, int *len)
                return NULL;
        }
 
-       *len = r->content_length - (r->bytes_read - r->bytes_header);
+       *len = (int)(r->content_length - (r->bytes_read - r->bytes_header));
        *len = *len > sizeof(wsh->buffer) ? sizeof(wsh->buffer) : *len;
 
-       if ((*len = ws_raw_read(wsh, wsh->buffer, *len, wsh->block)) < 0) {
+       if ((*len = (int)ws_raw_read(wsh, wsh->buffer, *len, wsh->block)) < 0) {
                *len = 0;
                return NULL;
        }
@@ -1464,7 +1464,7 @@ static switch_status_t http_stream_write(switch_stream_handle_t *handle, const c
 
        if (data) {
                if (ret) {
-                       ret = ws_raw_write(&jsock->ws, data, (uint32_t)strlen(data));
+                       ret =(int) ws_raw_write(&jsock->ws, data, (uint32_t)strlen(data));
                }
                switch_safe_free(data);
        }
@@ -1559,7 +1559,7 @@ new_req:
        }
 
        request.headers = stream.param_event;
-       if (switch_http_parse_header(jsock->ws.buffer, jsock->ws.datalen, &request) != SWITCH_STATUS_SUCCESS) {
+       if (switch_http_parse_header(jsock->ws.buffer, (uint32_t)jsock->ws.datalen, &request) != SWITCH_STATUS_SUCCESS) {
                switch_event_destroy(&stream.param_event);
                goto err;
        }
@@ -3995,7 +3995,7 @@ static void handle_mcast_sub(verto_profile_t *profile)
                return;
        }
 
-       bytes = mcast_socket_recv(&profile->mcast_sub, NULL, 0, 0);
+       bytes = (int)mcast_socket_recv(&profile->mcast_sub, NULL, 0, 0);
 
        if (bytes > 0) {
                cJSON *json;

diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 66f8e6cbb23f880be23fd60270b26f1319c2bf95..8d1b1d55676bed17e81755567ab6d3b6b6fd4b6b 100644 (file)
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -395,7 +395,7 @@ static void event_handler(switch_event_t *event)
 SWITCH_STANDARD_APP(socket_function)
 {
        char *host, *port_name, *path;
-       switch_socket_t *new_sock;
+       switch_socket_t *new_sock = NULL;
        switch_sockaddr_t *sa;
        switch_port_t port = 8084;
        listener_t *listener;

diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
index f3ca51cbc20f222f1b3fa79be4a4f39f8ce08161..4bce79aff486f67eade3a17d41d4784f705602e5 100644 (file)
--- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp
+++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp
@@ -1405,7 +1405,7 @@ SWIGINTERN int  SWIG_Lua_class_tostring(lua_State* L)
 /*  there should be 1 param passed in
   (1) userdata (not the metatable) */
   assert(lua_isuserdata(L,1));  /* just in case */
-  unsigned long userData = (unsigned long)lua_touserdata(L,1); /* get the userdata address for later */
+  unsigned long userData = (unsigned long)(intptr_t)lua_touserdata(L,1); /* get the userdata address for later */
   lua_getmetatable(L,1);    /* get the meta table */
   assert(lua_istable(L,-1));  /* just in case */
   

diff --git a/src/switch_buffer.c b/src/switch_buffer.c
index 56b0b94bb109ac925f9d61c7b7f500623ad33668..b2fd1482fe5e6d3b26e12fa8f500500c8a82257e 100644 (file)
--- a/src/switch_buffer.c
+++ b/src/switch_buffer.c
@@ -115,6 +115,7 @@ SWITCH_DECLARE(switch_status_t) switch_buffer_create_dynamic(switch_buffer_t **b
                if (start_len) {
                        if (!(new_buffer->data = malloc(start_len))) {
                                free(new_buffer);
+                               *buffer = NULL;
                                return SWITCH_STATUS_MEMERR;
                        }
                        memset(new_buffer->data, 0, start_len);
@@ -130,7 +131,7 @@ SWITCH_DECLARE(switch_status_t) switch_buffer_create_dynamic(switch_buffer_t **b
                *buffer = new_buffer;
                return SWITCH_STATUS_SUCCESS;
        }
-
+       *buffer = NULL;
        return SWITCH_STATUS_MEMERR;
 }
 
@@ -268,6 +269,7 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_peek_zerocopy(switch_buffer_t *buffe
 
        if (buffer->used < 1) {
                buffer->used = 0;
+               *ptr = NULL;
                return 0;
        } else {
                reading = buffer->used;