diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-16 22:57:07 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-16 22:57:07 +0000 |
| commit | c82f6e1129b7d1c074d594ab8a89137729be4361 (patch) | |
| tree | f7291593a92b72c03de398d93087817cd7df80b5 /main | |
| parent | 758e6ad7a9346642dc7c97fe5693a9de3e780805 (diff) | |
Merged revisions 295280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r295280 | rmudgett | 2010-11-16 16:52:06 -0600 (Tue, 16 Nov 2010) | 1 line
Dead code elimination in channel.c:ast_channel_bridge() variable who.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@295281 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index 460c7bd62..1e06bd4df 100644 --- a/main/channel.c +++ b/main/channel.c @@ -5326,7 +5326,6 @@ static void bridge_play_sounds(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; @@ -5425,8 +5424,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; } @@ -5462,8 +5459,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; ast_debug(1, "Bridge stops because we're zombie or need a soft hangup: c0=%s, c1=%s, flags: %s,%s,%s,%s\n", c0->name, c1->name, |