[asterisk-commits] mmichelson: branch mmichelson/digit_manipulation r196235 - /team/mmichelson/d...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri May 22 11:17:55 2009
New Revision: 196235

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196235
Log:
Clean up indentation level of ast_channel_connected_line_macro.


Modified:
    team/mmichelson/digit_manipulation/main/channel.c

Modified: team/mmichelson/digit_manipulation/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mmichelson/digit_manipulation/main/channel.c?view=diff&rev=196235&r1=196234&r2=196235
==============================================================================
--- team/mmichelson/digit_manipulation/main/channel.c (original)
+++ team/mmichelson/digit_manipulation/main/channel.c Fri May 22 11:17:55 2009
@@ -6510,6 +6510,7 @@
 		struct ast_frame *frame;
 		struct ast_party_connected_line *connected;
 	} pointer;
+	int retval;
 
 	if (frame) {
 		pointer.frame = connected_info;
@@ -6522,20 +6523,21 @@
 	macro_args = ast_strdupa(S_OR(pbx_builtin_getvar_helper(macro_chan, caller ? "CONNECTED_LINE_CALLER_SEND_MACRO_ARGS" : "CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS"), ""));
 	ast_channel_unlock(macro_chan);
 
-	if (!ast_strlen_zero(macro)) {
-		int retval;
-		if (frame) {
-			ast_connected_line_parse_data(pointer.frame->data.ptr, pointer.frame->datalen, &macro_chan->connected);
-		} else {
-			ast_party_connected_line_copy(&macro_chan->connected, pointer.connected);
-		}
-		if (!(retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args))) {
-			ast_channel_update_connected_line(macro_chan, &macro_chan->connected);
-		}
-		return retval;
+	if (ast_strlen_zero(macro)) {
+		return -1;
+	}
+
+	if (frame) {
+		ast_connected_line_parse_data(pointer.frame->data.ptr, pointer.frame->datalen, &macro_chan->connected);
 	} else {
-		return -1;
-	}
+		ast_party_connected_line_copy(&macro_chan->connected, pointer.connected);
+	}
+
+	if (!(retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args))) {
+		ast_channel_update_connected_line(macro_chan, &macro_chan->connected);
+	}
+
+	return retval;
 }
 
 /* DO NOT PUT ADDITIONAL FUNCTIONS BELOW THIS BOUNDARY