[asterisk-commits] dvossel: branch dvossel/sip_uri_encode_decode r242511 - /team/dvossel/sip_uri...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Jan 22 17:06:34 2010
New Revision: 242511

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242511
Log:
changes variable name to make more sense

Modified:
    team/dvossel/sip_uri_encode_decode/channels/chan_sip.c

Modified: team/dvossel/sip_uri_encode_decode/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/sip_uri_encode_decode/channels/chan_sip.c?view=diff&rev=242511&r1=242510&r2=242511
==============================================================================
--- team/dvossel/sip_uri_encode_decode/channels/chan_sip.c (original)
+++ team/dvossel/sip_uri_encode_decode/channels/chan_sip.c Fri Jan 22 17:06:34 2010
@@ -14009,7 +14009,7 @@
 */
 static int get_destination(struct sip_pvt *p, struct sip_request *oreq)
 {
-	char tmp[256] = "", *uri, *a;
+	char tmp[256] = "", *uri, *domain;
 	char tmpf[256] = "", *from = NULL;
 	struct sip_request *req;
 	char *decoded_uri;
@@ -14024,15 +14024,15 @@
 	
 	uri = get_in_brackets(tmp);
 
-	if (parse_uri(uri, "sip:,sips:", &uri, NULL, &a, NULL, NULL, NULL)) {
+	if (parse_uri(uri, "sip:,sips:", &uri, NULL, &domain, NULL, NULL, NULL)) {
 		ast_log(LOG_WARNING, "Not a SIP header (%s)?\n", uri);
 		return -1;
 	}
 
-	SIP_PEDANTIC_DECODE(a);
+	SIP_PEDANTIC_DECODE(domain);
 	SIP_PEDANTIC_DECODE(uri);
 
-	ast_string_field_set(p, domain, a);
+	ast_string_field_set(p, domain, domain);
 
 	/* Now find the From: caller ID and name */
 	/* XXX Why is this done in get_destination? Isn't it already done?
@@ -14041,15 +14041,15 @@
 	ast_copy_string(tmpf, get_header(req, "From"), sizeof(tmpf));
 	if (!ast_strlen_zero(tmpf)) {
 		from = get_in_brackets(tmpf);
-		if (parse_uri(from, "sip:,sips:", &from, NULL, &a, NULL, NULL, NULL)) {
+		if (parse_uri(from, "sip:,sips:", &from, NULL, &domain, NULL, NULL, NULL)) {
 			ast_log(LOG_WARNING, "Not a SIP header (%s)?\n", from);
 			return -1;
 		}
 
 		SIP_PEDANTIC_DECODE(from);
-		SIP_PEDANTIC_DECODE(a);
-
-		ast_string_field_set(p, fromdomain, a);
+		SIP_PEDANTIC_DECODE(domain);
+
+		ast_string_field_set(p, fromdomain, domain);
 	}
 
 	if (!AST_LIST_EMPTY(&domain_list)) {