Remove some redundant or unnecessary connected line-related function calls.
authorMark Michelson <mmichelson@digium.com>
Tue, 26 May 2009 19:50:07 +0000 (19:50 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 26 May 2009 19:50:07 +0000 (19:50 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@196893 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_directed_pickup.c
channels/chan_sip.c

index f0f74f1..2696b44 100644 (file)
@@ -97,7 +97,6 @@ static int pickup_do(struct ast_channel *chan, struct ast_channel *target)
        ast_debug(1, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
 
        connected_caller = target->connected;
-       ast_party_connected_line_init(&target->connected);
        connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
        ast_channel_update_connected_line(chan, &connected_caller);
 
index c6b1801..20e47a4 100644 (file)
@@ -20471,7 +20471,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
                                ast_channel_lock(target.chan1);
                                ast_party_connected_line_copy(&connected_caller, &target.chan1->connected);
                                ast_channel_unlock(target.chan1);
-                               connected_caller = target.chan1->connected;
                                connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
                                ast_channel_update_connected_line(current->chan2, &connected_caller);
                                ast_party_connected_line_free(&connected_caller);