[svn-commits] eliel: branch eliel/appdelim r181300 - /team/eliel/appdelim/apps/app_dial.c

[SVN commits to the Digium repositories]

Author: eliel
Date: Wed Mar 11 12:03:55 2009
New Revision: 181300

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181300
Log:
Make the Dial() application use AST_STANDARD_APP_DELIM instead of the hard-coded ',' (comma).

Modified:
    team/eliel/appdelim/apps/app_dial.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=181300&r1=181299&r2=181300
==============================================================================
--- team/eliel/appdelim/apps/app_dial.c (original)
+++ team/eliel/appdelim/apps/app_dial.c Wed Mar 11 12:03:55 2009
@@ -1101,7 +1101,7 @@
 {
 	for (; *s; s++)
 		if (*s == '^')
-			*s = ',';
+			*s = AST_STANDARD_APP_DELIM_CHAR;
 }
 
 /* returns true if there is a valid privacy reply */
@@ -1624,7 +1624,7 @@
 		AST_LIST_HEAD(, ast_dialed_interface) *dialed_interfaces;
 		num_dialed++;
 		if (!number) {
-			ast_log(LOG_WARNING, "Dial argument takes format (technology/[device:]number1)\n");
+			ast_log(LOG_WARNING, "Dial argument takes format %s\n", ast_application_syntax("Dial"));
 			goto out;
 		}
 		if (!(tmp = ast_calloc(1, sizeof(*tmp))))
@@ -2026,13 +2026,14 @@
 				gosub_argstart = strchr(opt_args[OPT_ARG_CALLEE_GOSUB], ',');
 				if (gosub_argstart) {
 					*gosub_argstart = 0;
-					if (asprintf(&gosub_args, "%s,s,1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], gosub_argstart + 1) < 0) {
+					if (asprintf(&gosub_args, "%s%ss%s1(%s)", opt_args[OPT_ARG_CALLEE_GOSUB], AST_STANDARD_APP_DELIM,
+						AST_STANDARD_APP_DELIM, gosub_argstart + 1) < 0) {
 						ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
 						gosub_args = NULL;
 					}
 					*gosub_argstart = ',';
 				} else {
-					if (asprintf(&gosub_args, "%s,s,1", opt_args[OPT_ARG_CALLEE_GOSUB]) < 0) {
+					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));
 						gosub_args = NULL;
 					}