Use the handy UNLINK macro instead of hand-coding the same thing in-line.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@202966 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 5 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9498b6352..1b97606d8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15530,11 +15530,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;
 			}