diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-16 23:02:36 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-16 23:02:36 +0000 |
| commit | 32edc9c8858f05dbe82eaa4229de97f21a6366a3 (patch) | |
| tree | fedbfbe3492520ee5015921a0f5bfb8d722723ac /main | |
| parent | 4dda59c3287f6a15e920183bb4ff6d0c3dbde718 (diff) | |
Merged revisions 295281 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r295281 | rmudgett | 2010-11-16 16:57:07 -0600 (Tue, 16 Nov 2010) | 9 lines
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.8@295282 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index 60ccafffd..6fcf7d767 100644 --- a/main/channel.c +++ b/main/channel.c @@ -6960,7 +6960,7 @@ 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, *chans[2] = { c0, c1 }; + struct ast_channel *chans[2] = { c0, c1 }; enum ast_bridge_result res = AST_BRIDGE_COMPLETE; format_t o0nativeformats; format_t o1nativeformats; @@ -7069,8 +7069,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; } @@ -7108,8 +7106,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, |