mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
as discussed with Mark a few weeks ago, the 'newstack' argument
in pbx_exec is always 1 so it can be removed. This change also takes away ast_exec_extension(), and lets all switch functions (exists, canmatch, exec, matchmore) all use the same prototype, which makes the code a bit cleaner. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1090,7 +1090,7 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv
|
||||
app = pbx_findapp(argv[1]);
|
||||
|
||||
if (app) {
|
||||
res = pbx_exec(chan, app, argv[2], 1);
|
||||
res = pbx_exec(chan, app, argv[2]);
|
||||
} else {
|
||||
ast_log(LOG_WARNING, "Could not find application (%s)\n", argv[1]);
|
||||
res = -2;
|
||||
|
@@ -502,7 +502,7 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee
|
||||
if (option_verbose > 3)
|
||||
ast_verbose(VERBOSE_PREFIX_3 "User hit '%s' to record call. filename: %s\n", code, args);
|
||||
|
||||
pbx_exec(callee_chan, monitor_app, args, 1);
|
||||
pbx_exec(callee_chan, monitor_app, args);
|
||||
pbx_builtin_setvar_helper(callee_chan, "TOUCH_MONITOR_OUTPUT", touch_filename);
|
||||
pbx_builtin_setvar_helper(caller_chan, "TOUCH_MONITOR_OUTPUT", touch_filename);
|
||||
|
||||
@@ -924,7 +924,7 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer,
|
||||
struct ast_channel *work = chan;
|
||||
if (ast_test_flag(feature, AST_FEATURE_FLAG_CALLEE))
|
||||
work = peer;
|
||||
res = pbx_exec(work, app, feature->app_args, 1);
|
||||
res = pbx_exec(work, app, feature->app_args);
|
||||
if (res < 0)
|
||||
return res;
|
||||
} else {
|
||||
@@ -1267,7 +1267,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
|
||||
if (monitor_app && src) {
|
||||
char *tmp = ast_strdupa(monitor_exec);
|
||||
if (tmp) {
|
||||
pbx_exec(src, monitor_app, tmp, 1);
|
||||
pbx_exec(src, monitor_app, tmp);
|
||||
} else {
|
||||
ast_log(LOG_ERROR, "Monitor failed: out of memory\n");
|
||||
}
|
||||
|
Reference in New Issue
Block a user