[asterisk-commits] rmudgett: branch group/bridge_construction r387023 - /team/group/bridge_const...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Apr 30 16:17:14 CDT 2013
Author: rmudgett
Date: Tue Apr 30 16:17:11 2013
New Revision: 387023
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387023
Log:
Fix set but not used compiler warning in check_swap_optimize_out().
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=387023&r1=387022&r2=387023
==============================================================================
--- team/group/bridge_construction/main/bridging.c (original)
+++ team/group/bridge_construction/main/bridging.c Tue Apr 30 16:17:11 2013
@@ -3621,7 +3621,6 @@
struct ast_bridge_channel *peer_bridge_channel)
{
struct ast_bridge *dst_bridge = NULL;
- struct ast_bridge *src_bridge = NULL;
struct ast_bridge_channel *dst_bridge_channel = NULL;
struct ast_bridge_channel *src_bridge_channel = NULL;
int peer_priority;
@@ -3641,13 +3640,11 @@
if (chan_bridge->num_channels == 2
&& chan_priority <= peer_priority) {
dst_bridge = peer_bridge;
- src_bridge = chan_bridge;
dst_bridge_channel = peer_bridge_channel;
src_bridge_channel = chan_bridge_channel;
} else if (peer_bridge->num_channels == 2
&& peer_priority <= chan_priority) {
dst_bridge = chan_bridge;
- src_bridge = peer_bridge;
dst_bridge_channel = chan_bridge_channel;
src_bridge_channel = peer_bridge_channel;
}
@@ -3656,7 +3653,6 @@
&& !ast_test_flag(&peer_bridge->feature_flags, AST_BRIDGE_FLAG_SWAP_INHIBIT_TO)) {
/* Can swap optimize only one way. */
dst_bridge = peer_bridge;
- src_bridge = chan_bridge;
dst_bridge_channel = peer_bridge_channel;
src_bridge_channel = chan_bridge_channel;
} else if (peer_bridge->num_channels == 2
@@ -3664,7 +3660,6 @@
&& !ast_test_flag(&chan_bridge->feature_flags, AST_BRIDGE_FLAG_SWAP_INHIBIT_TO)) {
/* Can swap optimize only one way. */
dst_bridge = chan_bridge;
- src_bridge = peer_bridge;
dst_bridge_channel = chan_bridge_channel;
src_bridge_channel = peer_bridge_channel;
}
More information about the asterisk-commits
mailing list