From 77ad5ec2e30a7fab0779288426c20de048332ea2 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Thu, 6 Mar 2014 00:33:13 +0000 Subject: [PATCH] app_confbridge: Remove some noop code. ........ Merged revisions 409976 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@409977 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/confbridge/conf_state_inactive.c | 7 ------- apps/confbridge/conf_state_multi.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c index 379f071a50..24631e2c7c 100644 --- a/apps/confbridge/conf_state_inactive.c +++ b/apps/confbridge/conf_state_inactive.c @@ -38,7 +38,6 @@ static void join_unmarked(struct confbridge_user *user); static void join_marked(struct confbridge_user *user); static void leave_waitmarked(struct confbridge_user *user); -static void transition_to_inactive(struct confbridge_user *user); struct confbridge_state STATE_INACTIVE = { .name = "INACTIVE", @@ -46,7 +45,6 @@ struct confbridge_state STATE_INACTIVE = { .join_waitmarked = conf_default_join_waitmarked, .join_marked = join_marked, .leave_waitmarked = leave_waitmarked, - .entry = transition_to_inactive, }; struct confbridge_state *CONF_STATE_INACTIVE = &STATE_INACTIVE; @@ -73,8 +71,3 @@ static void leave_waitmarked(struct confbridge_user *user) conf_change_state(user, CONF_STATE_EMPTY); } } - -static void transition_to_inactive(struct confbridge_user *user) -{ - return; -} diff --git a/apps/confbridge/conf_state_multi.c b/apps/confbridge/conf_state_multi.c index 8297742530..eca8899faa 100644 --- a/apps/confbridge/conf_state_multi.c +++ b/apps/confbridge/conf_state_multi.c @@ -38,7 +38,6 @@ static void join_unmarked(struct confbridge_user *user); static void join_marked(struct confbridge_user *user); static void leave_unmarked(struct confbridge_user *user); -void transition_to_multi(struct confbridge_user *user); struct confbridge_state STATE_MULTI = { .name = "MULTI", @@ -47,7 +46,6 @@ struct confbridge_state STATE_MULTI = { .join_marked = join_marked, .leave_unmarked = leave_unmarked, .leave_waitmarked = conf_default_leave_waitmarked, - .entry = transition_to_multi, }; struct confbridge_state *CONF_STATE_MULTI = &STATE_MULTI; @@ -72,8 +70,3 @@ static void leave_unmarked(struct confbridge_user *user) conf_change_state(user, CONF_STATE_SINGLE); } } - -void transition_to_multi(struct confbridge_user *user) -{ - return; -}