diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-23 19:51:41 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-23 19:51:41 +0000 |
commit | fd0b69a4e7f57297f9c011c75820432d693e21a5 (patch) | |
tree | c9c73917bfd120da30c16650000c7296781fae50 /apps/app_macro.c | |
parent | b5741f9dd4e38302ab7d62f3999c59f5b9011ac5 (diff) |
Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
using old methods of parsing arguments to using the standard macros. However, the big
change is that the really old way of specifying application and arguments separated by
a comma will no longer work (e.g. NoOp,foo|bar). Instead, the way that has been
recommended since long before 1.0 will become the only method available (e.g. NoOp(foo,bar).
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@76703 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rw-r--r-- | apps/app_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 5f71bcd7f..aa24dd94c 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -197,7 +197,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) tmp = ast_strdupa(data); rest = tmp; - macro = strsep(&rest, "|"); + macro = strsep(&rest, ","); if (ast_strlen_zero(macro)) { ast_log(LOG_WARNING, "Invalid macro name specified\n"); return 0; @@ -255,7 +255,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) ast_copy_string(chan->context, fullmacro, sizeof(chan->context)); chan->priority = 1; - while((cur = strsep(&rest, "|")) && (argc < MAX_ARGS)) { + while((cur = strsep(&rest, ",")) && (argc < MAX_ARGS)) { const char *s; /* Save copy of old arguments if we're overwriting some, otherwise let them pass through to the other macro */ |