[svn-commits] trunk r31871 - /trunk/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Sat Jun  3 18:46:23 2006
New Revision: 31871

URL: http://svn.digium.com/view/asterisk?rev=31871&view=rev
Log:
small simplification in assignments, and fix a typo in a comment.


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=31871&r1=31870&r2=31871&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat Jun  3 18:46:23 2006
@@ -7417,20 +7417,14 @@
 }
 
 
-/*! \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);