diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-03-30 21:29:39 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-03-30 21:29:39 +0000 |
| commit | 6c232811c0bf80366955a6bcfb0f7619c4d65717 (patch) | |
| tree | 19e1a3bfe72426fb7dbb848341e68fd087e1fcbd /apps | |
| parent | c6d1bfbb31696458618c7fca0ba42cfedbd3f354 (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 'apps')
| -rw-r--r-- | apps/app_dial.c | 2 | ||||
| -rw-r--r-- | apps/app_exec.c | 2 | ||||
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | apps/app_page.c | 2 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 2 | ||||
| -rw-r--r-- | apps/app_while.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 2f9a4b0a3..921ee46a0 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1449,7 +1449,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (*ch == '^') *ch = '|'; } - res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO], 1); + res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO]); ast_log(LOG_DEBUG, "Macro exited with status %d\n", res); res = 0; } else { diff --git a/apps/app_exec.c b/apps/app_exec.c index 3b1f30a4f..2acd1b3d6 100644 --- a/apps/app_exec.c +++ b/apps/app_exec.c @@ -82,7 +82,7 @@ static int exec_exec(struct ast_channel *chan, void *data) if (appname) { app = pbx_findapp(appname); if (app) { - res = pbx_exec(chan, app, args, 1); + res = pbx_exec(chan, app, args); } else { ast_log(LOG_WARNING, "Could not find application (%s)\n", appname); res = -1; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index f1e213885..2229c57da 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1143,7 +1143,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c app = pbx_findapp("agi"); if (app) { char *s = ast_strdupa(agifile); - ret = pbx_exec(chan, app, s, 1); + ret = pbx_exec(chan, app, s); } else { ast_log(LOG_WARNING, "Could not find application (agi)\n"); ret = -2; diff --git a/apps/app_page.c b/apps/app_page.c index d848fb875..a9ad2c16d 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -186,7 +186,7 @@ static int page_exec(struct ast_channel *chan, void *data) } if (!res) { snprintf(meetmeopts, sizeof(meetmeopts), "%ud|A%sqxd", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t"); - pbx_exec(chan, app, meetmeopts, 1); + pbx_exec(chan, app, meetmeopts); } LOCAL_USER_REMOVE(u); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c0abc2a4d..369008390 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3422,7 +3422,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i old_priority = chan->priority; /* call the the Directory, changes the channel */ - res = pbx_exec(chan, app, context ? context : "default", 1); + res = pbx_exec(chan, app, context ? context : "default"); ast_copy_string(username, chan->exten, sizeof(username)); diff --git a/apps/app_while.c b/apps/app_while.c index 423858a8e..8805e60b5 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -101,7 +101,7 @@ static int execif_exec(struct ast_channel *chan, void *data) { if (ast_true(expr)) { if ((app = pbx_findapp(myapp))) { - res = pbx_exec(chan, app, mydata, 1); + res = pbx_exec(chan, app, mydata); } else { ast_log(LOG_WARNING, "Count not find application! (%s)\n", myapp); res = -1; |