summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-03-30 21:29:39 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-03-30 21:29:39 +0000
commit6c232811c0bf80366955a6bcfb0f7619c4d65717 (patch)
tree19e1a3bfe72426fb7dbb848341e68fd087e1fcbd /res
parentc6d1bfbb31696458618c7fca0ba42cfedbd3f354 (diff)
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
Diffstat (limited to 'res')
-rw-r--r--res/res_agi.c2
-rw-r--r--res/res_features.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/res/res_agi.c b/res/res_agi.c
index 2a6849a68..e88920da3 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -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;
diff --git a/res/res_features.c b/res/res_features.c
index 59d263f51..ebd225f8a 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -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");
}