From ed310c8d336975c103d336947deaa42df4a41548 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 7 Feb 2006 22:58:56 +0000 Subject: [PATCH] switch_state_handler_table renames and msvc build fix. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@557 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_iax/mod_iax.c | 2 +- src/mod/endpoints/mod_portaudio/mod_portaudio.c | 2 +- src/mod/endpoints/mod_woomera/mod_woomera.c | 2 +- src/switch_channel.c | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c index d44d57b929..1b8f9a6179 100644 --- a/src/mod/endpoints/mod_iax/mod_iax.c +++ b/src/mod/endpoints/mod_iax/mod_iax.c @@ -741,7 +741,7 @@ static switch_status channel_answer_channel(switch_core_session *session) return SWITCH_STATUS_SUCCESS; } -static const switch_event_handler_table channel_event_handlers = { +static const switch_state_handler_table channel_event_handlers = { /*.on_init */ channel_on_init, /*.on_ring */ channel_on_ring, /*.on_execute */ channel_on_execute, diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c index 657cb73632..555311d519 100644 --- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c +++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c @@ -486,7 +486,7 @@ static struct switch_api_interface channel_api_interface = { /*.next */ &channel_hup_interface }; -static const switch_event_handler_table channel_event_handlers = { +static const switch_state_handler_table channel_event_handlers = { /*.on_init */ channel_on_init, /*.on_ring */ channel_on_ring, /*.on_execute */ channel_on_execute, diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c index 50dd61c810..25d2032e45 100644 --- a/src/mod/endpoints/mod_woomera/mod_woomera.c +++ b/src/mod/endpoints/mod_woomera/mod_woomera.c @@ -476,7 +476,7 @@ static switch_status woomerachan_write_frame(switch_core_session *session, switc } -static const switch_event_handler_table woomerachan_event_handlers = { +static const switch_state_handler_table woomerachan_event_handlers = { /*.on_init */ woomerachan_on_init, /*.on_ring */ woomerachan_on_ring, /*.on_execute */ woomerachan_on_execute, diff --git a/src/switch_channel.c b/src/switch_channel.c index 919ba1173f..271ed22360 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -488,8 +488,10 @@ SWITCH_DECLARE(switch_caller_profile *) switch_channel_get_originatee_caller_pro SWITCH_DECLARE(int) switch_channel_add_state_handler(switch_channel *channel, const switch_state_handler_table *state_handler) { + int index; + assert(channel != NULL); - int index = channel->state_handler_index++; + index = channel->state_handler_index++; if (channel->state_handler_index >= SWITCH_MAX_STATE_HANDLERS) { return -1;