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

1 files changed, 4 insertions, 4 deletions

diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index 493070f42..aa9048a0e 100755
--- a/apps/app_groupcount.c
+++ b/apps/app_groupcount.c
@@ -117,13 +117,13 @@ static int group_set_exec(struct ast_channel *chan, void *data)
 	struct localuser *u;
 	static int deprecation_warning = 0;
 
+	LOCAL_USER_ADD(u);
+	
 	if (!deprecation_warning) {
 	        ast_log(LOG_WARNING, "The SetGroup application has been deprecated, please use the GROUP() function.\n");
 		deprecation_warning = 1;
 	}
 
-	LOCAL_USER_ADD(u);
-
 	if (ast_app_group_set_channel(chan, data))
 		ast_log(LOG_WARNING, "SetGroup requires an argument (group name)\n");
 
@@ -140,8 +140,6 @@ static int group_check_exec(struct ast_channel *chan, void *data)
 	char category[80]="";
 	static int deprecation_warning = 0;
 
-	LOCAL_USER_ADD(u);
-
 	if (!deprecation_warning) {
 	        ast_log(LOG_WARNING, "The CheckGroup application has been deprecated, please use a combination of the GotoIf application and the GROUP_COUNT() function.\n");
 		deprecation_warning = 1;
@@ -152,6 +150,8 @@ static int group_check_exec(struct ast_channel *chan, void *data)
 		return res;
 	}
 
+	LOCAL_USER_ADD(u);
+
   	ast_app_group_split_group(data, limit, sizeof(limit), category, sizeof(category));
 
  	if ((sscanf(limit, "%d", &max) == 1) && (max > -1)) {