From fd0b69a4e7f57297f9c011c75820432d693e21a5 Mon Sep 17 00:00:00 2001 From: tilghman Date: Mon, 23 Jul 2007 19:51:41 +0000 Subject: 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 --- apps/app_page.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/app_page.c') diff --git a/apps/app_page.c b/apps/app_page.c index 8edb15833..8b90fc0b4 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -86,7 +86,7 @@ AST_APP_OPTIONS(page_opts, { static int page_exec(struct ast_channel *chan, void *data) { char *options, *tech, *resource, *tmp; - char meetmeopts[88], originator[AST_CHANNEL_NAME]; + char meetmeopts[88], originator[AST_CHANNEL_NAME], *opts[0]; struct ast_flags flags = { 0 }; unsigned int confid = ast_random(); struct ast_app *app; @@ -109,9 +109,9 @@ static int page_exec(struct ast_channel *chan, void *data) if ((tmp = strchr(originator, '-'))) *tmp = '\0'; - tmp = strsep(&options, "|"); + tmp = strsep(&options, ","); if (options) - ast_app_parse_options(page_opts, &flags, NULL, options); + ast_app_parse_options(page_opts, &flags, opts, options); snprintf(meetmeopts, sizeof(meetmeopts), "MeetMe|%ud|%s%sqxdw(5)", confid, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"), (ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") ); -- cgit v1.2.3