Merged revisions 293339 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r293339 | rmudgett | 2010-10-29 19:34:12 -0500 (Fri, 29 Oct 2010) | 1 line

  Remove some code that serves no purpose.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@293340 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 2ac06305da0d725c09b985fd0f5bac32fe1aa0bd..70dbc687dd417b979868ccf872791d60c2dd1da8 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -6590,17 +6590,6 @@ static struct ast_frame *dahdi_handle_event(struct ast_channel *ast)
                                                /* Lets see what we're up to */
                                                if (((ast->pbx) || (ast->_state == AST_STATE_UP)) &&
                                                        (p->transfertobusy || (ast->_state != AST_STATE_BUSY))) {
-                                                       struct ast_channel *other = ast_bridged_channel(p->subs[SUB_THREEWAY].owner);
-                                                       int way3bridge = 0, cdr3way = 0;
-
-                                                       if (!other) {
-                                                               other = ast_bridged_channel(p->subs[SUB_REAL].owner);
-                                                       } else
-                                                               way3bridge = 1;
-
-                                                       if (p->subs[SUB_THREEWAY].owner->cdr)
-                                                               cdr3way = 1;
-
                                                        ast_verb(3, "Building conference on call on %s and %s\n", p->subs[SUB_THREEWAY].owner->name, p->subs[SUB_REAL].owner->name);
                                                        /* Put them in the threeway, and flip */
                                                        p->subs[SUB_THREEWAY].inthreeway = 1;