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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@295281 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 460c7bd62375480bd9ad10d80eb8ecb7779ed9b6..1e06bd4df5869d45ce7b34f5737dad90885623f2 100644 (file)
--- 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,