[svn-commits] rmudgett: branch group/bridge_construction r384366 - /team/group/bridge_const...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Mar 29 15:06:01 2013
New Revision: 384366

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384366
Log:
Rename ast_bridge_channel_lock_bridge to remove ast_ prefix since it is a private function.

Modified:
    team/group/bridge_construction/main/bridging.c

Modified: team/group/bridge_construction/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bridge_construction/main/bridging.c?view=diff&rev=384366&r1=384365&r2=384366
==============================================================================
--- team/group/bridge_construction/main/bridging.c (original)
+++ team/group/bridge_construction/main/bridging.c Fri Mar 29 15:06:01 2013
@@ -211,7 +211,7 @@
  *
  * \return Nothing
  */
-static void ast_bridge_channel_lock_bridge(struct ast_bridge_channel *bridge_channel)
+static void bridge_channel_lock_bridge(struct ast_bridge_channel *bridge_channel)
 {
 	struct ast_bridge *bridge;
 
@@ -697,7 +697,7 @@
 /* BUGBUG bridge join or impart needs to do CONNECTED_LINE updates if the channels are being swapped and it is a 1-1 bridge. */
 
 	/* Simply write the frame out to the bridge technology. */
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 /* BUGBUG The tech is where AST_CONTROL_ANSWER hook should go. (early bridge) */
 /* BUGBUG The tech is where incoming BUSY/CONGESTION hangup should happen? (early bridge) */
 	bridge_channel->bridge->technology->write(bridge_channel->bridge, bridge_channel, frame);
@@ -1423,7 +1423,7 @@
  */
 static void bridge_channel_suspend(struct ast_bridge_channel *bridge_channel)
 {
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 	bridge_channel_suspend_nolock(bridge_channel);
 	ast_bridge_unlock(bridge_channel->bridge);
 }
@@ -1466,7 +1466,7 @@
  */
 static void bridge_channel_unsuspend(struct ast_bridge_channel *bridge_channel)
 {
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 	bridge_channel_unsuspend_nolock(bridge_channel);
 	ast_bridge_unlock(bridge_channel->bridge);
 }
@@ -1552,7 +1552,7 @@
 		.data.ptr = (char *) dtmf,
 	};
 
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 	bridge_channel->bridge->technology->write(bridge_channel->bridge, bridge_channel, &action);
 	ast_bridge_unlock(bridge_channel->bridge);
 }
@@ -1964,7 +1964,7 @@
 
 		bridge_channel_wait(bridge_channel);
 	}
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 
 	ast_bridge_channel_pull(bridge_channel);
 	ast_bridge_reconfigured(bridge_channel->bridge);
@@ -2405,7 +2405,7 @@
 	ao2_ref(bridge_channel, +1);
 	ast_channel_unlock(chan);
 
-	ast_bridge_channel_lock_bridge(bridge_channel);
+	bridge_channel_lock_bridge(bridge_channel);
 	bridge = bridge_channel->bridge;
 	if (bridge_channel == find_bridge_channel(bridge, chan)) {
 /* BUGBUG this needs more work.  The channels need to be made compatible again if the formats change. The bridge_channel thread needs to monitor for this case. */