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, 5 insertions, 1 deletions

diff --git a/apps/app_intercom.c b/apps/app_intercom.c
index 996576b88..e18950be1 100755
--- a/apps/app_intercom.c
+++ b/apps/app_intercom.c
@@ -157,6 +157,7 @@ static int intercom_exec(struct ast_channel *chan, void *data)
 	res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
 	if (res < 0) {
 		ast_log(LOG_WARNING, "Unable to set format to signed linear on channel %s\n", chan->name);
+		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
 	/* Read packets from the channel */
@@ -184,9 +185,12 @@ static int intercom_exec(struct ast_channel *chan, void *data)
 				res = -1;
 		}
 	}
-	LOCAL_USER_REMOVE(u);
+	
 	if (!res)
 		ast_set_read_format(chan, oreadformat);
+
+	LOCAL_USER_REMOVE(u);
+
 	return res;
 }