cleanup some warnings

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

diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index 1dac9c5aab7e60e18c0a6683729b9695ca58a9a0..ffa0e5e96a70e12bfb86ba331b5a0cf428b571c4 100644 (file)
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -288,7 +288,7 @@ struct switch_speech_interface {
        switch_status (*speech_open)(switch_speech_handle *sh,
                                                                 unsigned int flags);
        /*! function to close the speech interface */
-       switch_status (*speech_close)(switch_speech_handle *);
+       switch_status (*speech_close)(switch_speech_handle *, unsigned int *flags);
        /*! function to feed audio to the ASR*/
        switch_status (*speech_feed_asr)(switch_speech_handle *sh, void *data, unsigned int *len, int rate, unsigned int *flags);
        /*! function to read text from the ASR*/

diff --git a/src/switch_core.c b/src/switch_core.c
index 5c2bf0313dd0d4d9b2842c4f0072b5d16384a5fc..02dcc0073a74d35da0b321163a2f94165c5402f2 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -552,7 +552,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_read_tts(switch_speech_handle *
 
 SWITCH_DECLARE(switch_status) switch_core_speech_close(switch_speech_handle *sh, unsigned int *flags)
 {
-       return sh->speech_interface->speech_close(sh);
+       return sh->speech_interface->speech_close(sh, flags);
 }
 
 SWITCH_DECLARE(switch_status) switch_core_timer_init(switch_timer *timer, char *timer_name, int interval, int samples,
@@ -630,11 +630,6 @@ static void *switch_core_service_thread(switch_thread *thread, void *obj)
        channel = switch_core_session_get_channel(session);
        assert(channel != NULL);
 
-#ifdef WTF
-       data->running = 0;
-       return NULL;
-#endif
-
        while (data->running > 0) {
                switch (switch_core_session_read_frame(session, &read_frame, -1, stream_id)) {
                case SWITCH_STATUS_SUCCESS:

diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c
index 0c3a6209701ad42006cd451ce4bfba12fd9d4aab..0c01e7f7eca78a6d37d4140ae08e1c645f46d5fe 100644 (file)
--- a/src/switch_loadable_module.c
+++ b/src/switch_loadable_module.c
@@ -514,6 +514,9 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool
        for (x = 0; x < preflen; x++) {
                if ((codec_interface = switch_loadable_module_get_codec_interface(prefs[x])) != 0 ) {
                        array[i++] = codec_interface;
+                       if (i > arraylen) {
+                               break;
+                       }
                }
        }