From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 3 Jun 2006 23:46:23 +0000 (+0000)
Subject: small simplification in assignments, and fix a typo in a comment.
X-Git-Tag: 1.4.0-beta1~1084
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2724885b78a7afb65c041246df5f4d2ecc8758dc;p=thirdparty%2Fasterisk.git

small simplification in assignments, and fix a typo in a comment.



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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 63897dcf30..e57942b834 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7417,20 +7417,14 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi
 }
 
 
-/*! \brief Call transfer support (old way, depreciated by the IETF)--*/
+/*! \brief Call transfer support (old way, deprecated by the IETF)--*/
 static int get_also_info(struct sip_pvt *p, struct sip_request *oreq)
 {
 	char tmp[256] = "", *c, *a;
-	struct sip_request *req = oreq;
-	struct sip_refer *referdata;
+	struct sip_request *req = oreq ? oreq : &p->initreq;
+	struct sip_refer *referdata = p->refer;
 	const char *transfer_context = NULL;
 	
-	referdata = p->refer;
-	
-	if (!oreq)
-		req = &p->initreq;
-	else
-		req = oreq;
 	ast_copy_string(tmp, get_header(req, "Also"), sizeof(tmp));
 	c = get_in_brackets(tmp);