[asterisk-commits] rmudgett: trunk r409977 - in /trunk: ./ apps/confbridge/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Mar  5 18:33:13 2014
New Revision: 409977

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409977
Log:
app_confbridge: Remove some noop code.
........

Merged revisions 409976 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/apps/confbridge/conf_state_inactive.c
    trunk/apps/confbridge/conf_state_multi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/apps/confbridge/conf_state_inactive.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_state_inactive.c?view=diff&rev=409977&r1=409976&r2=409977
==============================================================================
--- trunk/apps/confbridge/conf_state_inactive.c (original)
+++ trunk/apps/confbridge/conf_state_inactive.c Wed Mar  5 18:33:13 2014
@@ -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 @@
 	.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 @@
 		conf_change_state(user, CONF_STATE_EMPTY);
 	}
 }
-
-static void transition_to_inactive(struct confbridge_user *user)
-{
-	return;
-}

Modified: trunk/apps/confbridge/conf_state_multi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_state_multi.c?view=diff&rev=409977&r1=409976&r2=409977
==============================================================================
--- trunk/apps/confbridge/conf_state_multi.c (original)
+++ trunk/apps/confbridge/conf_state_multi.c Wed Mar  5 18:33:13 2014
@@ -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 @@
 	.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 @@
 		conf_change_state(user, CONF_STATE_SINGLE);
 	}
 }
-
-void transition_to_multi(struct confbridge_user *user)
-{
-	return;
-}