diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-06 21:32:23 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-06 21:32:23 +0000 |
commit | eac30d741194acadac0a26f1ad3cec1e32a86ca2 (patch) | |
tree | e8818c78e616be2b5d8958c474a57c2a44f885a3 /apps | |
parent | 8f3ab72bb2d05279e0583b588a8b34b1a48f8de3 (diff) |
Merged revisions 210908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r210908 | tilghman | 2009-08-06 16:29:26 -0500 (Thu, 06 Aug 2009) | 9 lines
Allow Gosub to recognize quote delimiters without consuming them.
(closes issue #15557)
Reported by: rain
Patches:
20090723__issue15557.diff.txt uploaded by tilghman (license 14)
Tested by: rain
Review: https://reviewboard.asterisk.org/r/316/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@210909 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_stack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index aa367dbd6..2f56d925a 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -264,7 +264,7 @@ static int gosub_exec(struct ast_channel *chan, void *data) *endparen = '\0'; else ast_log(LOG_WARNING, "Ouch. No closing paren: '%s'?\n", (char *)data); - AST_STANDARD_APP_ARGS(args2, tmp); + AST_STANDARD_RAW_ARGS(args2, tmp); } else args2.argc = 0; @@ -326,13 +326,13 @@ static int gosubif_exec(struct ast_channel *chan, void *data) } args = ast_strdupa(data); - AST_NONSTANDARD_APP_ARGS(cond, args, '?'); + AST_NONSTANDARD_RAW_ARGS(cond, args, '?'); if (cond.argc != 2) { ast_log(LOG_WARNING, "GosubIf requires an argument: GosubIf(cond?label1(args):label2(args)\n"); return 0; } - AST_NONSTANDARD_APP_ARGS(label, cond.labels, ':'); + AST_NONSTANDARD_RAW_ARGS(label, cond.labels, ':'); if (pbx_checkcondition(cond.ition)) { if (!ast_strlen_zero(label.iftrue)) |