From 70739b6d2e4946509657be395cdb72d6f496daab Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 20 Feb 2006 04:36:29 +0000 Subject: [PATCH] fix more msvc warnings. Fix mod_sndfile build on OSX git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@635 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_module_interfaces.h | 4 ++-- src/mod/applications/mod_bridgecall/mod_bridgecall.c | 2 +- src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj | 4 ++-- src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj | 4 ++-- src/mod/applications/mod_playback/mod_playback.c | 2 +- src/mod/applications/mod_playback/mod_playback.vcproj | 4 ++-- src/mod/codecs/mod_g711/g711.c | 8 ++++---- src/mod/codecs/mod_g711/mod_g711.vcproj | 4 ++-- src/mod/codecs/mod_g729/mod_g729.vcproj | 4 ++-- src/mod/codecs/mod_gsm/mod_gsm.vcproj | 4 ++-- src/mod/codecs/mod_l16/mod_l16.vcproj | 4 ++-- src/mod/codecs/mod_speex/mod_speex.c | 2 +- src/mod/codecs/mod_speex/mod_speex.vcproj | 4 ++-- .../dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj | 4 ++-- .../mod_dialplan_directory/mod_dialplan_directory.vcproj | 4 ++-- src/mod/dialplans/mod_pcre/mod_pcre.vcproj | 4 ++-- src/mod/directories/mod_ldap/mod_ldap.vcproj | 8 ++++---- src/mod/endpoints/mod_exosip/mod_exosip.vcproj | 4 ++-- src/mod/endpoints/mod_iax/mod_iax.vcproj | 4 ++-- src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj | 4 ++-- src/mod/endpoints/mod_woomera/mod_woomera.vcproj | 4 ++-- .../mod_event_multicast/mod_event_multicast.vcproj | 4 ++-- .../event_handlers/mod_event_test/mod_event_test.vcproj | 4 ++-- .../event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj | 4 ++-- src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj | 4 ++-- src/mod/formats/mod_sndfile/mod_sndfile.c | 6 +++--- src/mod/formats/mod_sndfile/mod_sndfilel.vcproj | 4 ++-- src/mod/timers/mod_softtimer/mod_softtimer.vcproj | 4 ++-- w32/vsnet/FreeSwitchConsole.vcproj | 4 ++-- 29 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index f751e1f4ef..1dac9c5aab 100644 --- a/src/include/switch_module_interfaces.h +++ b/src/include/switch_module_interfaces.h @@ -241,9 +241,9 @@ struct switch_file_interface { /*! function to close the file */ switch_status (*file_close)(switch_file_handle *); /*! function to read from the file */ - switch_status (*file_read)(switch_file_handle *, void *data, unsigned int *len); + switch_status (*file_read)(switch_file_handle *, void *data, size_t *len); /*! function to write from the file */ - switch_status (*file_write)(switch_file_handle *, void *data, unsigned int *len); + switch_status (*file_write)(switch_file_handle *, void *data, size_t *len); /*! function to seek to a certian position in the file */ switch_status (*file_seek)(switch_file_handle *, unsigned int *cur_pos, unsigned int samples, int whence); /*! list of supported file extensions */ diff --git a/src/mod/applications/mod_bridgecall/mod_bridgecall.c b/src/mod/applications/mod_bridgecall/mod_bridgecall.c index 5d978773bf..ea5075965b 100644 --- a/src/mod/applications/mod_bridgecall/mod_bridgecall.c +++ b/src/mod/applications/mod_bridgecall/mod_bridgecall.c @@ -174,7 +174,7 @@ static void audio_bridge_function(switch_core_session *session, char *data) strncpy(chan_type, data, sizeof(chan_type)); - if ((chan_data = strchr(chan_type, '/'))) { + if ((chan_data = strchr(chan_type, '/')) != 0) { *chan_data = '\0'; chan_data++; } diff --git a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj index 9cf28d3646..5ead64296b 100644 --- a/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj +++ b/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj index ede8881b4c..6e61d8c3e5 100644 --- a/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj +++ b/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/applications/mod_playback/mod_playback.c b/src/mod/applications/mod_playback/mod_playback.c index 3e8932cd6c..d56da492be 100644 --- a/src/mod/applications/mod_playback/mod_playback.c +++ b/src/mod/applications/mod_playback/mod_playback.c @@ -57,7 +57,7 @@ static void playback_function(switch_core_session *session, char *data) file_name = switch_core_session_strdup(session, data); - if ((timer_name = strchr(file_name, ' '))) { + if ((timer_name = strchr(file_name, ' ')) != 0) { *timer_name++ = '\0'; } diff --git a/src/mod/applications/mod_playback/mod_playback.vcproj b/src/mod/applications/mod_playback/mod_playback.vcproj index e584929093..fe00109d4e 100644 --- a/src/mod/applications/mod_playback/mod_playback.vcproj +++ b/src/mod/applications/mod_playback/mod_playback.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/codecs/mod_g711/g711.c b/src/mod/codecs/mod_g711/g711.c index 2d47891c99..334c079fdf 100644 --- a/src/mod/codecs/mod_g711/g711.c +++ b/src/mod/codecs/mod_g711/g711.c @@ -161,7 +161,7 @@ unsigned char linear2alaw(short pcm_val) aval |= (pcm_val >> 1) & QUANT_MASK; else aval |= (pcm_val >> seg) & QUANT_MASK; - return (aval ^ mask); + return (unsigned char)(aval ^ mask); } } @@ -177,7 +177,7 @@ short alaw2linear(unsigned char a_val) a_val ^= 0x55; t = (a_val & QUANT_MASK) << 4; - seg = ((unsigned) a_val & SEG_MASK) >> SEG_SHIFT; + seg = (short)(((unsigned) a_val & SEG_MASK) >> SEG_SHIFT); switch (seg) { case 0: t += 8; @@ -252,8 +252,8 @@ unsigned char linear2ulaw(short pcm_val) if (seg >= 8) /* out of range, return maximum value. */ return (unsigned char) (0x7F ^ mask); else { - uval = (unsigned char) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF); - return (uval ^ mask); + uval = (unsigned char) ((seg << 4) | ((pcm_val >> (seg + 1)) & 0xF)); + return (unsigned char) (uval ^ mask); } } diff --git a/src/mod/codecs/mod_g711/mod_g711.vcproj b/src/mod/codecs/mod_g711/mod_g711.vcproj index a1e3151e25..fe834caa42 100644 --- a/src/mod/codecs/mod_g711/mod_g711.vcproj +++ b/src/mod/codecs/mod_g711/mod_g711.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/codecs/mod_g729/mod_g729.vcproj b/src/mod/codecs/mod_g729/mod_g729.vcproj index 5819c68f5c..3fb0c0769e 100644 --- a/src/mod/codecs/mod_g729/mod_g729.vcproj +++ b/src/mod/codecs/mod_g729/mod_g729.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/codecs/mod_gsm/mod_gsm.vcproj b/src/mod/codecs/mod_gsm/mod_gsm.vcproj index 0cb4afe286..d5a8b930cf 100644 --- a/src/mod/codecs/mod_gsm/mod_gsm.vcproj +++ b/src/mod/codecs/mod_gsm/mod_gsm.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/codecs/mod_l16/mod_l16.vcproj b/src/mod/codecs/mod_l16/mod_l16.vcproj index c83a02e4b2..85cb89cd2a 100644 --- a/src/mod/codecs/mod_l16/mod_l16.vcproj +++ b/src/mod/codecs/mod_l16/mod_l16.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/codecs/mod_speex/mod_speex.c b/src/mod/codecs/mod_speex/mod_speex.c index f351807880..c1110dceab 100644 --- a/src/mod/codecs/mod_speex/mod_speex.c +++ b/src/mod/codecs/mod_speex/mod_speex.c @@ -87,7 +87,7 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl memcpy(&codec->codec_settings, codec_settings, sizeof(codec->codec_settings)); - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { + if (!(encoding || decoding) || ((context = switch_core_alloc(codec->memory_pool, sizeof(*context))) == 0)) { return SWITCH_STATUS_FALSE; } else { const SpeexMode *mode = NULL; diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj index 8d05466ef9..678eb4c7a8 100644 --- a/src/mod/codecs/mod_speex/mod_speex.vcproj +++ b/src/mod/codecs/mod_speex/mod_speex.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj b/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj index e616e18d5e..fa03f71d54 100644 --- a/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj +++ b/src/mod/dialplans/mod_dialplan_demo/mod_dialplan_demo.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj index 7a98810904..5ad7971ed0 100644 --- a/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj +++ b/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj index 4c7d30bdd4..4d020eeed0 100644 --- a/src/mod/dialplans/mod_pcre/mod_pcre.vcproj +++ b/src/mod/dialplans/mod_pcre/mod_pcre.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;PCRE_STATIC" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/directories/mod_ldap/mod_ldap.vcproj b/src/mod/directories/mod_ldap/mod_ldap.vcproj index 0830c42df2..318d1f9513 100644 --- a/src/mod/directories/mod_ldap/mod_ldap.vcproj +++ b/src/mod/directories/mod_ldap/mod_ldap.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> @@ -212,7 +212,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -292,7 +292,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;MSLDAP" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj index 648ba5f7fb..41a323015f 100644 --- a/src/mod/endpoints/mod_exosip/mod_exosip.vcproj +++ b/src/mod/endpoints/mod_exosip/mod_exosip.vcproj @@ -50,7 +50,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -134,7 +134,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/endpoints/mod_iax/mod_iax.vcproj b/src/mod/endpoints/mod_iax/mod_iax.vcproj index a65c560729..34ef0ef62a 100644 --- a/src/mod/endpoints/mod_iax/mod_iax.vcproj +++ b/src/mod/endpoints/mod_iax/mod_iax.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj index 178407adb2..149b7b364e 100644 --- a/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj +++ b/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -129,7 +129,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.vcproj b/src/mod/endpoints/mod_woomera/mod_woomera.vcproj index 40e1464679..12378e8284 100644 --- a/src/mod/endpoints/mod_woomera/mod_woomera.vcproj +++ b/src/mod/endpoints/mod_woomera/mod_woomera.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj index 533cb35fec..7c753e35a1 100644 --- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj +++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj b/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj index 4c2c6e4251..631bf56175 100644 --- a/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj +++ b/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj index d8ead66185..3657abab27 100644 --- a/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj +++ b/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj index ef2ffd9985..3a45066a75 100644 --- a/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj +++ b/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/formats/mod_sndfile/mod_sndfile.c b/src/mod/formats/mod_sndfile/mod_sndfile.c index 6efb77efd4..2b34c67f53 100644 --- a/src/mod/formats/mod_sndfile/mod_sndfile.c +++ b/src/mod/formats/mod_sndfile/mod_sndfile.c @@ -48,7 +48,7 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path) char *ext; int ready = 1; - if (!(ext = strrchr(path, '.'))) { + if ((ext = strrchr(path, '.')) == 0) { switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid Format\n"); return SWITCH_STATUS_GENERR; } @@ -68,7 +68,7 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path) return SWITCH_STATUS_GENERR; } - if (!(context = switch_core_alloc(handle->memory_pool, sizeof(*context)))) { + if ((context = switch_core_alloc(handle->memory_pool, sizeof(*context))) == 0) { return SWITCH_STATUS_MEMERR; } @@ -125,7 +125,7 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path) }; - if (!(context->handle = sf_open(path, mode, &context->sfinfo))) { + if ((context->handle = sf_open(path, mode, &context->sfinfo)) == 0) { switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle)); return SWITCH_STATUS_GENERR; diff --git a/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj b/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj index b0e0bb1add..ed2648314c 100644 --- a/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj +++ b/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj @@ -48,7 +48,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -128,7 +128,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/src/mod/timers/mod_softtimer/mod_softtimer.vcproj b/src/mod/timers/mod_softtimer/mod_softtimer.vcproj index 4dd4a3c508..13d3840765 100644 --- a/src/mod/timers/mod_softtimer/mod_softtimer.vcproj +++ b/src/mod/timers/mod_softtimer/mod_softtimer.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -125,7 +125,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj index 099b7489d7..369318e806 100644 --- a/w32/vsnet/FreeSwitchConsole.vcproj +++ b/w32/vsnet/FreeSwitchConsole.vcproj @@ -47,7 +47,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="1" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -123,7 +123,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" />