[asterisk-commits] russell: branch group/sip-object-matching r180198 - in /team/group/sip-object...

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Mar  4 14:16:10 2009
New Revision: 180198

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180198
Log:
sync with trunk

Modified:
    team/group/sip-object-matching/   (props changed)
    team/group/sip-object-matching/main/callerid.c

Propchange: team/group/sip-object-matching/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/sip-object-matching/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar  4 14:16:10 2009
@@ -1,1 +1,1 @@
-/trunk:1-180155
+/trunk:1-180197

Modified: team/group/sip-object-matching/main/callerid.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/sip-object-matching/main/callerid.c?view=diff&rev=180198&r1=180197&r2=180198
==============================================================================
--- team/group/sip-object-matching/main/callerid.c (original)
+++ team/group/sip-object-matching/main/callerid.c Wed Mar  4 14:16:10 2009
@@ -1008,7 +1008,7 @@
 	char *ns, *ne, *ls, *le;
 
 	/* Try "name" <location> format or name <location> format */
-	if ((ls = strchr(instr, '<')) && (le = strchr(ls, '>'))) {
+	if ((ls = strrchr(instr, '<')) && (le = strrchr(ls, '>'))) {
 		*ls = *le = '\0';	/* location found, trim off the brackets */
 		*location = ls + 1;	/* and this is the result */
 		if ((ns = strchr(instr, '"')) && (ne = strchr(ns + 1, '"'))) {