[asterisk-commits] eliel: branch eliel/appdelim r190215 - /team/eliel/appdelim/apps/

[SVN commits to the Asterisk project]

Author: eliel
Date: Thu Apr 23 10:48:24 2009
New Revision: 190215

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=190215
Log:
Move the code to start using AST_STANDARD_APP_DELIM, instead of hardcoding a ',',
as the parameter separator.


Modified:
    team/eliel/appdelim/apps/app_dial.c
    team/eliel/appdelim/apps/app_page.c
    team/eliel/appdelim/apps/app_stack.c

Modified: team/eliel/appdelim/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/eliel/appdelim/apps/app_dial.c?view=diff&rev=190215&r1=190214&r2=190215
==============================================================================
--- team/eliel/appdelim/apps/app_dial.c (original)
+++ team/eliel/appdelim/apps/app_dial.c Thu Apr 23 10:48:24 2009
@@ -2201,7 +2201,7 @@
 						ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
 						gosub_args = NULL;
 					}
-					*gosub_argstart = ',';
+					*gosub_argstart = AST_STANDARD_APP_DELIM_CHAR;
 				} else {
 					if (asprintf(&gosub_args, "%s%ss%s1", opt_args[OPT_ARG_CALLEE_GOSUB], AST_STANDARD_APP_DELIM, AST_STANDARD_APP_DELIM) < 0) {
 						ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));

Modified: team/eliel/appdelim/apps/app_page.c
URL: http://svn.digium.com/svn-view/asterisk/team/eliel/appdelim/apps/app_page.c?view=diff&rev=190215&r1=190214&r2=190215
==============================================================================
--- team/eliel/appdelim/apps/app_page.c (original)
+++ team/eliel/appdelim/apps/app_page.c Thu Apr 23 10:48:24 2009
@@ -164,8 +164,8 @@
 		timeout = atoi(args.timeout);
 	}
 
-	snprintf(meetmeopts, sizeof(meetmeopts), "MeetMe,%ud,%s%sqxdw(5)", confid, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"),
-		(ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") );
+	snprintf(meetmeopts, sizeof(meetmeopts), "MeetMe%c%ud%c%s%sqxdw(5)", AST_STANDARD_APP_DELIM_CHAR, confid, AST_STANDARD_APP_DELIM_CHAR,
+		(ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m"), (ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") );
 
 	/* Count number of extensions in list by number of ampersands + 1 */
 	num_dials = 1;
@@ -247,7 +247,7 @@
 	}
 
 	if (!res) {
-		snprintf(meetmeopts, sizeof(meetmeopts), "%ud,A%s%sqxd", confid, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t"), 
+		snprintf(meetmeopts, sizeof(meetmeopts), "%ud%cA%s%sqxd", confid, AST_STANDARD_APP_DELIM_CHAR, (ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t"), 
 			(ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") );
 		pbx_exec(chan, app, meetmeopts);
 	}

Modified: team/eliel/appdelim/apps/app_stack.c
URL: http://svn.digium.com/svn-view/asterisk/team/eliel/appdelim/apps/app_stack.c?view=diff&rev=190215&r1=190214&r2=190215
==============================================================================
--- team/eliel/appdelim/apps/app_stack.c (original)
+++ team/eliel/appdelim/apps/app_stack.c Thu Apr 23 10:48:24 2009
@@ -581,12 +581,12 @@
 	 * call a Gosub for the CALLEE channel in Dial or Queue.
 	 */
 	if (argc == 5) {
-		if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + 1, argv[4]) < 0) {
+		if (asprintf(&gosub_args, "%s%c%s%c%d(%s)", argv[1], AST_STANDARD_APP_DELIM_CHAR, argv[2], AST_STANDARD_APP_DELIM_CHAR, priority + 1, argv[4]) < 0) {
 			ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
 			gosub_args = NULL;
 		}
 	} else {
-		if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + 1) < 0) {
+		if (asprintf(&gosub_args, "%s%c%s%c%d", argv[1], AST_STANDARD_APP_DELIM_CHAR, argv[2], AST_STANDARD_APP_DELIM_CHAR, priority + 1) < 0) {
 			ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
 			gosub_args = NULL;
 		}