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_substring.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_substring.c')
-rwxr-xr-x | apps/app_substring.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/app_substring.c b/apps/app_substring.c index bb1b83577..b06628cf0 100755 --- a/apps/app_substring.c +++ b/apps/app_substring.c @@ -75,6 +75,9 @@ static int substring_exec(struct ast_channel *chan, void *data) char newexten[AST_MAX_EXTENSION] = ""; char *count1, *count2; char *first, *second, *stringp; + struct localuser *u; + + LOCAL_USER_ADD(u); stringp=alloca(strlen(data)+1); ast_log(LOG_WARNING, "The use of Substring application is deprecated. Please use ${variable:a:b} instead\n"); @@ -87,6 +90,7 @@ static int substring_exec(struct ast_channel *chan, void *data) count2=strsep(&stringp,"\0"); if (!first || !second || !count1 || !count2) { ast_log(LOG_DEBUG, "Ignoring, since there is no argument: variable or string or count1 or count2\n"); + LOCAL_USER_REMOVE(u); return 0; } icount1=atoi(count1); @@ -118,6 +122,9 @@ static int substring_exec(struct ast_channel *chan, void *data) } else { ast_log(LOG_DEBUG, "Ignoring, no parameters\n"); } + + LOCAL_USER_REMOVE(u); + return 0; } |