[svn-commits] eliel: branch eliel/appdelim r181374 - /team/eliel/appdelim/apps/

[SVN commits to the Digium repositories]

Author: eliel
Date: Wed Mar 11 12:48:35 2009
New Revision: 181374

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181374
Log:
Move Queue() to use AST_STANDARD_APP_DELIM.
Make Exec get the ExecIf syntax from the XML documentation.

Modified:
    team/eliel/appdelim/apps/app_exec.c
    team/eliel/appdelim/apps/app_queue.c

Modified: team/eliel/appdelim/apps/app_exec.c
URL: http://svn.digium.com/svn-view/asterisk/team/eliel/appdelim/apps/app_exec.c?view=diff&rev=181374&r1=181373&r2=181374
==============================================================================
--- team/eliel/appdelim/apps/app_exec.c (original)
+++ team/eliel/appdelim/apps/app_exec.c Wed Mar 11 12:48:35 2009
@@ -231,7 +231,7 @@
 
 		AST_NONSTANDARD_APP_ARGS(expr, parse, '?');
 		if (ast_strlen_zero(expr.remainder)) {
-			ast_log(LOG_ERROR, "Usage: ExecIf(<expr>?<appiftrue>(<args>)[:<appiffalse>(<args)])\n");
+			ast_log(LOG_ERROR, "Usage: %s\n", ast_custom_function_syntax("ExecIf")); 
 			return -1;
 		}
 

Modified: team/eliel/appdelim/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/team/eliel/appdelim/apps/app_queue.c?view=diff&rev=181374&r1=181373&r2=181374
==============================================================================
--- team/eliel/appdelim/apps/app_queue.c (original)
+++ team/eliel/appdelim/apps/app_queue.c Wed Mar 11 12:48:35 2009
@@ -3991,11 +3991,13 @@
 	
 					snprintf(tmpid2, sizeof(tmpid2), "%s.%s", tmpid, qe->parent->monfmt);
 
-					if (!ast_strlen_zero(monitor_exec))
-						snprintf(mixmonargs, sizeof(mixmonargs), "%s,b%s,%s", tmpid2, monitor_options, monitor_exec);
-					else
-						snprintf(mixmonargs, sizeof(mixmonargs), "%s,b%s", tmpid2, monitor_options);
-					
+					if (!ast_strlen_zero(monitor_exec)) {
+						snprintf(mixmonargs, sizeof(mixmonargs), "%s%sb%s%s%s", tmpid2, AST_STANDARD_APP_DELIM,
+							monitor_options, AST_STANDARD_APP_DELIM, monitor_exec);
+					} else {
+						snprintf(mixmonargs, sizeof(mixmonargs), "%s%sb%s", tmpid2, AST_STANDARD_APP_DELIM, monitor_options);
+					}
+
 					ast_debug(1, "Arguments being passed to MixMonitor: %s\n", mixmonargs);
 					/* We purposely lock the CDR so that pbx_exec does not update the application data */
 					if (qe->chan->cdr)