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_controlplayback.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_controlplayback.c')
-rwxr-xr-x | apps/app_controlplayback.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index 8576cbb79..2a75c8652 100755 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -81,12 +81,14 @@ static int controlplayback_exec(struct ast_channel *chan, void *data) arg_pause = 5, arg_restart = 6, }; - - if (!data || ast_strlen_zero((char *)data)) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n"); return -1; } + LOCAL_USER_ADD(u); + tmp = ast_strdupa(data); memset(argv, 0, sizeof(argv)); @@ -94,6 +96,7 @@ static int controlplayback_exec(struct ast_channel *chan, void *data) if (argc < 1) { ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n"); + LOCAL_USER_REMOVE(u); return -1; } @@ -112,12 +115,8 @@ static int controlplayback_exec(struct ast_channel *chan, void *data) if (argv[arg_restart] && !is_on_phonepad(*argv[arg_restart])) argv[arg_restart] = NULL; - LOCAL_USER_ADD(u); - res = ast_control_streamfile(chan, argv[arg_file], argv[arg_fwd], argv[arg_rev], argv[arg_stop], argv[arg_pause], argv[arg_restart], skipms); - LOCAL_USER_REMOVE(u); - /* If we stopped on one of our stop keys, return 0 */ if (argv[arg_stop] && strchr(argv[arg_stop], res)) res = 0; @@ -127,6 +126,8 @@ static int controlplayback_exec(struct ast_channel *chan, void *data) res = 0; } + LOCAL_USER_REMOVE(u); + return res; } |