diff options
author | Mark Michelson <mmichelson@digium.com> | 2009-06-24 18:29:10 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2009-06-24 18:29:10 +0000 |
commit | 0a915a84e6162de2c7a939e1c49ede460e2c69b5 (patch) | |
tree | 1ecd115d920de0e0e681c25a2f85a85664f49341 /channels/chan_sip.c | |
parent | 4c07c7a6b276c2982b8fe7147fc1a3b5853a07e8 (diff) |
Merged revisions 202966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202966 | mmichelson | 2009-06-24 13:28:47 -0500 (Wed, 24 Jun 2009) | 3 lines
Use the handy UNLINK macro instead of hand-coding the same thing in-line.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5c15180f1..dbabdf982 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21142,11 +21142,7 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req) for (pkt = p->packets, prev_pkt = NULL; pkt; prev_pkt = pkt, pkt = pkt->next) { if (pkt->seqno == p->lastinvite && pkt->response_code == 487) { AST_SCHED_DEL(sched, pkt->retransid); - if (prev_pkt) { - prev_pkt->next = pkt->next; - } else { - p->packets = pkt->next; - } + UNLINK(pkt, p->packets, prev_pkt); ast_free(pkt); break; } |