further thought says '!' is a better early-match wildcard (bug #3889, take 2)

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

1 files changed, 4 insertions, 4 deletions

diff --git a/pbx.c b/pbx.c
index 8522b470a..9bdc5d5bf 100755
--- a/pbx.c
+++ b/pbx.c
@@ -633,7 +633,7 @@ static void pbx_destroy(struct ast_pbx *p)
 		case '.':\
 			/* Must match */\
 			return 1;\
-		case '+':\
+		case '!':\
 			/* Early match */\
 			return 2;\
 		case ' ':\
@@ -648,8 +648,8 @@ static void pbx_destroy(struct ast_pbx *p)
 		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 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan, struct ast
 				    (!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 {