From: Richard Mudgett Date: Sat, 30 Oct 2010 00:34:12 +0000 (+0000) Subject: Remove some code that serves no purpose. X-Git-Tag: 1.4.38-rc1~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bff8c6e7ddebdb165017b1d466d5a970f5903739;p=thirdparty%2Fasterisk.git Remove some code that serves no purpose. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@293339 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 292ea7aafd..d73f12a562 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -4975,17 +4975,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; - if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_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 */