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

diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c
index d44d57b9294e012d9e8632d628f8fcafd103125c..1b8f9a61795aa12f153039e9dc6f75b641ece61a 100644 (file)
--- 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 657cb73632f7c21c4806b2f08709fb6fb569214c..555311d51994fe5718ce7d88dcc3b07ec0b078cc 100644 (file)
--- 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 50dd61c810da432c80d7d047e49e2132d56433db..25d2032e452d3b318eb64db5dc5552dc2b68a783 100644 (file)
--- 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 919ba1173f857bf75b9cf4ac4e2a088ed3004c58..271ed22360c4ed07a14688cc910eb80c8480fce0 100644 (file)
--- 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;