aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-16 22:52:06 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-11-16 22:52:06 +0000
commit9a426eb9fefb940cf2e3c852151638b775abfa6c (patch)
tree1905711e32c9cc23d42830dc92e573809c1fc12d
parent398b1731d1072d32f2a5c475ee568784f91355dc (diff)
Dead code elimination in channel.c:ast_channel_bridge() variable who.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@295280 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/channel.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c
index e6c716d40..0db9dbff2 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4659,7 +4659,6 @@ static void update_bridgepeer(struct ast_channel *c0, struct ast_channel *c1)
enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1,
struct ast_bridge_config *config, struct ast_frame **fo, struct ast_channel **rc)
{
- struct ast_channel *who = NULL;
enum ast_bridge_result res = AST_BRIDGE_COMPLETE;
int nativefailed=0;
int firstpass;
@@ -4766,8 +4765,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
if (callee_warning && config->end_sound)
bridge_playfile(c1, c0, config->end_sound, 0);
*fo = NULL;
- if (who)
- *rc = who;
res = 0;
break;
}
@@ -4804,8 +4801,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) ||
ast_test_flag(c1, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c1)) {
*fo = NULL;
- if (who)
- *rc = who;
res = 0;
if (option_debug)
ast_log(LOG_DEBUG, "Bridge stops because we're zombie or need a soft hangup: c0=%s, c1=%s, flags: %s,%s,%s,%s\n",