aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_cut.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2005-10-19 18:19:02 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2005-10-19 18:19:02 +0000
commit58818426d60d583c4becc6a99b398cbac1b7b12f (patch)
tree5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_cut.c
parenta4d6ea67a7536e2cb2337527357ce6d3db8639f3 (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_cut.c')
-rwxr-xr-xapps/app_cut.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_cut.c b/apps/app_cut.c
index 96f0f9c3f..bc270371d 100755
--- a/apps/app_cut.c
+++ b/apps/app_cut.c
@@ -262,7 +262,6 @@ static int sort_exec(struct ast_channel *chan, void *data)
char *varname, *strings, result[512] = "";
static int dep_warning=0;
- LOCAL_USER_ADD(u);
if (!dep_warning) {
ast_log(LOG_WARNING, "The application Sort is deprecated. Please use the SORT() function instead.\n");
dep_warning=1;
@@ -270,10 +269,11 @@ static int sort_exec(struct ast_channel *chan, void *data)
if (!data) {
ast_log(LOG_ERROR, "Sort() requires an argument\n");
- LOCAL_USER_REMOVE(u);
return 0;
}
+ LOCAL_USER_ADD(u);
+
strings = ast_strdupa((char *)data);
if (!strings) {
ast_log(LOG_ERROR, "Out of memory\n");