build tweaks.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7939 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 9553e1b584df09382d2f1e11eb817e3632d0f86c..76e17c00a338f56673f7285d7a31d5cbdda21afb 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -326,7 +326,7 @@ SWITCH_STANDARD_APP(fifo_function)
         
         return;
     } else if (!strcasecmp(argv[1], "out")) {
-        void *pop;
+        void *pop = NULL;
         switch_frame_t *read_frame;
         switch_status_t status;
         char *uuid;

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index 396948f788d1fefe80572676faa8849ff8cf8eb1..6f9504c1ea7ac837104713b0a711629c6c874dd3 100644 (file)
--- a/src/mod/endpoints/mod_iax/mod_iax.c
+++ b/src/mod/endpoints/mod_iax/mod_iax.c
@@ -559,16 +559,14 @@ static switch_status_t channel_on_transmit(switch_core_session_t *session)
 
 static switch_status_t channel_waitfor_read(switch_core_session_t *session, int ms, int stream_id)
 {
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
+       assert(switch_core_session_get_private(session));
 
        return SWITCH_STATUS_SUCCESS;
 }
 
 static switch_status_t channel_waitfor_write(switch_core_session_t *session, int ms, int stream_id)
 {
-       private_t *tech_pvt = switch_core_session_get_private(session);
-       switch_assert(tech_pvt != NULL);
+       assert(switch_core_session_get_private(session));
 
        return SWITCH_STATUS_SUCCESS;
 }

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
index b51a73c91ae66ccb8a51a48f20e135de6eeec354..8cf7a0fa3529eb3d9a4fd32c8c32bda5cea12fb5 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
@@ -105,6 +105,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\su&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nua&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\win32&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\url&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sip&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\msg&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\sdp&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nta&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\nea&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\soa&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\iptsec&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\bnf&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\libsofia-sip-ua\tport&quot;"\r
                                PreprocessorDefinitions="LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB"\r
                                UsePrecompiledHeader="0"\r

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 7936cb588f6f7d2a6804d5b7321b9cb80551a647..a5da08542a7ac9dcf35535312c31ee3beff2bfd7 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -2288,11 +2288,9 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
        if (session) {
                /* Get the channel */
                switch_channel_t *channel = switch_core_session_get_channel(session);
-               /* make sure we have our privates */
-               struct private_object *tech_pvt = switch_core_session_get_private(session);
-               
-               /* Barf if we didn't get it */
-               switch_assert(tech_pvt != NULL);
+
+               /* Barf if we didn't get our private */
+               assert(switch_core_session_get_private(session));
 
                if (sip && sip->sip_content_type && sip->sip_content_type->c_type && sip->sip_content_type->c_subtype && 
                        sip->sip_payload && sip->sip_payload->pl_data) {