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

diff --git a/main/channel.c b/main/channel.c
index 60ccafffdd1b5591b8485d264477a80873b65e88..6fcf7d76744db45eae3ae218a1c9c650f81c7b4f 100644 (file)
--- 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,