From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 26 Aug 2005 20:10:17 +0000 (+0000)
Subject: work around parsing problem by using GotoIf() (issue #4876)
X-Git-Tag: 1.2.0-beta1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27dda09b0ff6c851b1e9cf41cee266297880cec8;p=thirdparty%2Fasterisk.git

work around parsing problem by using GotoIf() (issue #4876)


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

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index a56c87ba79..e422e9b1a2 100755
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -642,8 +642,8 @@ static int __build_step(const char *what, const char *name, const char *filename
 			if (ast_add_extension2(con, 0, exten, ifend, *label, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			*label = NULL;
-			app = "Goto";
-			snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, ifstart, elsestart);
+			app = "GotoIf";
+			snprintf(margs, mlen, "$[ %s ]?%d:%d", args, ifstart, elsestart);
 			if (ast_add_extension2(con, 0, exten, ifblock, iflabel, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			if (ifskip) {
@@ -694,8 +694,8 @@ static int __build_step(const char *what, const char *name, const char *filename
 			if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			*label = NULL;
-			app = "Goto";
-			snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, whileblock, whileend);
+			app = "GotoIf";
+			snprintf(margs, mlen, "$[ %s ]?%d:%d", args, whileblock, whileend);
 			if (ast_add_extension2(con, 0, exten, whilestart, whilelabel, NULL, app, strdup(margs), FREE, registrar))
 				ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 			fillin_process(con, fillin, filename, lineno, exten, whileend, exten, whilestart);
@@ -797,8 +797,8 @@ static int __build_step(const char *what, const char *name, const char *filename
 				if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
 					ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
 				*label = NULL;
-				app = "Goto";
-				snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", fields->next->data, forblock, forend);
+				app = "GotoIf";
+				snprintf(margs, mlen, "$[ %s ]?%d:%d", fields->next->data, forblock, forend);
 				if (ast_add_extension2(con, 0, exten, forstart, forlabel, NULL, app, strdup(margs), FREE, registrar))
 					ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", forstart, what, name);
 				fillin_process(con, fillin, filename, lineno, exten, forend, exten, forstart);