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, 3 insertions, 4 deletions

diff --git a/apps/app_image.c b/apps/app_image.c
index e54c90820..0434eb310 100755
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -61,14 +61,13 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
 	int res = 0;
 	struct localuser *u;
 	
-	LOCAL_USER_ADD(u);
-
-	if (!data || !strlen((char *)data)) {
+	if (!data || ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "SendImage requires an argument (filename)\n");
-		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
 
+	LOCAL_USER_ADD(u);
+
 	if (!ast_supports_images(chan)) {
 		/* Does not support transport */
 		ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);