]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
win code before decl error + compile warns
authorJeff Lenk <jeff@jefflenk.com>
Mon, 9 Nov 2009 17:15:46 +0000 (17:15 +0000)
committerJeff Lenk <jeff@jefflenk.com>
Mon, 9 Nov 2009 17:15:46 +0000 (17:15 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15399 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_sofia/mod_sofia.c

index 323e9f15d7c7979d28dec7785e93cdf7386be7a4..bbe3c25f7e1c77ed927a098042572b6d379944df 100644 (file)
@@ -787,7 +787,7 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                        }
 
                        if (tech_pvt->read_frame.datalen > 0) {
-                               size_t bytes = 0;
+                               uint32_t bytes = 0;
                                int frames = 1;
                                
                                if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) {
@@ -804,7 +804,7 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                                }
                                                
                                                if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_impl.encoded_bytes_per_packet) {
-                                                       switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - 
+                                                       uint32_t codec_ms = (int)(tech_pvt->read_frame.timestamp - 
                                                                                                                   tech_pvt->last_ts) / (tech_pvt->read_impl.samples_per_second / 1000);
                                                        if ((codec_ms % 10) != 0) {
                                                                tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
@@ -1545,8 +1545,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                                }
 
                                if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) {
-                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason);
                                        char *extra_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_RESPONSE_HEADER_PREFIX);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason);
 
                                        nua_respond(tech_pvt->nh, code, su_strdup(nua_handle_home(tech_pvt->nh), reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)),
                                                                SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL),