diff options
author | Richard Mudgett <rmudgett@digium.com> | 2014-03-06 00:33:13 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2014-03-06 00:33:13 +0000 |
commit | 77ad5ec2e30a7fab0779288426c20de048332ea2 (patch) | |
tree | 3cd4fc341126ec9fe266b5e8b08772e28c7939ad /apps | |
parent | 4515cb31452077671e4a58242363f7cc0aaec7c8 (diff) |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/confbridge/conf_state_inactive.c | 7 | ||||
-rw-r--r-- | apps/confbridge/conf_state_multi.c | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/apps/confbridge/conf_state_inactive.c b/apps/confbridge/conf_state_inactive.c index 379f071a5..24631e2c7 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 829774253..eca8899fa 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; -} |