diff options
author | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
commit | 4aa7912057e83f052e94637f0b1a10026fe14558 (patch) | |
tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_zapbarge.c | |
parent | e5afdbbe160b3267df769c9f04c04c6f152b1c94 (diff) |
Massive cleanups to applications for LOCAL_USER handling and some other things.
In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application. An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_zapbarge.c')
-rwxr-xr-x | apps/app_zapbarge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c index 148543381..3f3a8ae66 100755 --- a/apps/app_zapbarge.c +++ b/apps/app_zapbarge.c @@ -267,14 +267,17 @@ static int conf_exec(struct ast_channel *chan, void *data) int confno = 0; char confstr[80] = ""; + LOCAL_USER_ADD(u); + if (data && !ast_strlen_zero(data)) { if ((sscanf(data, "Zap/%d", &confno) != 1) && (sscanf(data, "%d", &confno) != 1)) { ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data); + LOCAL_USER_REMOVE(u); return 0; } } - LOCAL_USER_ADD(u); + if (chan->_state != AST_STATE_UP) ast_answer(chan); |