diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
commit | 58818426d60d583c4becc6a99b398cbac1b7b12f (patch) | |
tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_page.c | |
parent | a4d6ea67a7536e2cb2337527357ce6d3db8639f3 (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: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_page.c')
-rwxr-xr-x | apps/app_page.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_page.c b/apps/app_page.c index 6f6463e20..2e3d0e1e5 100755 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -120,25 +120,25 @@ static int page_exec(struct ast_channel *chan, void *data) char *tmp; int res=0; - if (!data) - return -1; - - if (ast_strlen_zero(data)) { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n"); return -1; } + LOCAL_USER_ADD(u); + if (!(app = pbx_findapp("MeetMe"))) { ast_log(LOG_WARNING, "There is no MeetMe application available!\n"); + LOCAL_USER_REMOVE(u); return -1; }; - if (!(options = ast_strdupa((char *) data))) { + options = ast_strdupa(data); + if (!options) { ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); return -1; } - - LOCAL_USER_ADD(u); tmp = strsep(&options, "|"); if (options) |