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 /pbx/pbx_loopback.c | |
| 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 'pbx/pbx_loopback.c')
| -rw-r--r-- | pbx/pbx_loopback.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 5522e9b09..ffa006527 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -147,13 +147,11 @@ static int loopback_canmatch(struct ast_channel *chan, const char *context, cons return res; } -static int loopback_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, int newstack, const char *data) +static int loopback_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) { LOOPBACK_COMMON; - if (newstack) - res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid); - else - res = ast_exec_extension(chan, newcontext, newexten, newpriority, callerid); + res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid); + /* XXX hmmm... res is overridden ? */ if (newpattern && !ast_extension_match(newpattern, exten)) res = -1; return res; |