[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r321099 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu May 26 14:20:59 2011
New Revision: 321099

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321099
Log:
Format fixes

Modified:
    team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c
    team/irroot/distrotech-customers-trunk/main/channel.c

Modified: team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c?view=diff&rev=321099&r1=321098&r2=321099
==============================================================================
--- team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c (original)
+++ team/irroot/distrotech-customers-trunk/apps/app_directed_pickup.c Thu May 26 14:20:59 2011
@@ -103,7 +103,8 @@
 	if (!chan->pbx && !chan->masq &&
 		!ast_test_flag(chan, AST_FLAG_ZOMBIE) &&
 		(chan->_state == AST_STATE_RINGING ||
-		 chan->_state == AST_STATE_RING)) {
+		 chan->_state == AST_STATE_RING ||
+		 chan->_state == AST_STATE_DOWN)) {
 		return 1;
 	}
 	return 0;

Modified: team/irroot/distrotech-customers-trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/main/channel.c?view=diff&rev=321099&r1=321098&r2=321099
==============================================================================
--- team/irroot/distrotech-customers-trunk/main/channel.c (original)
+++ team/irroot/distrotech-customers-trunk/main/channel.c Thu May 26 14:20:59 2011
@@ -7344,7 +7344,8 @@
 	long time_left_ms=0;
 	char caller_warning = 0;
 	char callee_warning = 0;
-	const char *bridge_macro,*bridge_macro_args;
+	const char *bridge_macro;
+	const char *bridge_macro_args;
 
 	*fo = NULL;
 
@@ -7424,15 +7425,15 @@
 	ast_indicate(c0, AST_CONTROL_SRCUPDATE);
 	ast_indicate(c1, AST_CONTROL_SRCUPDATE);
 
-	bridge_macro=pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO");
+	bridge_macro = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO");
 	if (!ast_strlen_zero(bridge_macro)) {
-		bridge_macro_args=pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO_ARGS");
-		ast_app_run_macro(NULL, c1, bridge_macro, bridge_macro_args);
-	}
-	bridge_macro=pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO");
+		bridge_macro_args = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO_ARGS");
+		ast_app_run_macro(c0, c1, bridge_macro, bridge_macro_args);
+	}
+	bridge_macro = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO");
 	if (!ast_strlen_zero(bridge_macro)) {
-		bridge_macro_args=pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO_ARGS");
-		ast_app_run_macro(NULL, c0, bridge_macro, bridge_macro_args);
+		bridge_macro_args = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO_ARGS");
+		ast_app_run_macro(c1, c0, bridge_macro, bridge_macro_args);
 	}
 
 	for (/* ever */;;) {