From 2bea53541b3b848de57dd57edf63674ed084d1c6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 21 Feb 2006 15:05:18 +0000 Subject: [PATCH] cleanup some warnings git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@639 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_module_interfaces.h | 2 +- src/switch_core.c | 7 +------ src/switch_loadable_module.c | 3 +++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index 1dac9c5aab..ffa0e5e96a 100644 --- 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 5c2bf0313d..02dcc0073a 100644 --- 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 0c3a620970..0c01e7f7ec 100644 --- 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; + } } }