[Asterisk-cvs] asterisk pbx.c,1.221,1.222

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv28129

Modified Files:
	pbx.c 
Log Message:
further thought says '!' is a better early-match wildcard (bug #3889, take 2)


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- pbx.c	3 Apr 2005 21:32:33 -0000	1.221
+++ pbx.c	3 Apr 2005 22:24:17 -0000	1.222
@@ -633,7 +633,7 @@
 		case '.':\
 			/* Must match */\
 			return 1;\
-		case '+':\
+		case '!':\
 			/* Early match */\
 			return 2;\
 		case ' ':\
@@ -648,8 +648,8 @@
 		data++;\
 		pattern++;\
 	}\
-	/* If we ran off the end of the data and the pattern ends in '+', match */\
-	if (match && !*data && (*pattern == '+'))\
+	/* If we ran off the end of the data and the pattern ends in '!', match */\
+	if (match && !*data && (*pattern == '!'))\
 		return 2;\
 }
 
@@ -774,7 +774,7 @@
 				    (!eroot->matchcid || matchcid(eroot->cidmatch, callerid))) {
 
 					if (action == HELPER_MATCHMORE && match == 2 && !earlymatch) {
-						/* It matched an extension ending in a '+' wildcard
+						/* It matched an extension ending in a '!' wildcard
 						   So ignore it for now, unless there's a better match */
 						earlymatch = eroot;
 					} else {