[asterisk-commits] trunk r26849 - /trunk/channel.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu May 11 03:28:22 MST 2006


Author: kpfleming
Date: Thu May 11 05:28:22 2006
New Revision: 26849

URL: http://svn.digium.com/view/asterisk?rev=26849&view=rev
Log:
initialize the bridge result to 'no result', so that we can check for code paths that set it to AST_BRIDGE_COMPLETE inside the loop (thanks Oskar!)

Modified:
    trunk/channel.c

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=26849&r1=26848&r2=26849&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Thu May 11 05:28:22 2006
@@ -3276,7 +3276,7 @@
 	/* Copy voice back and forth between the two channels. */
 	struct ast_channel *cs[3];
 	struct ast_frame *f;
-	enum ast_bridge_result res = AST_BRIDGE_COMPLETE;
+	enum ast_bridge_result res = 0;
 	int o0nativeformats;
 	int o1nativeformats;
 	int watch_c0_dtmf;
@@ -3345,7 +3345,7 @@
 			default:
 				*fo = f;
 				*rc = who;
-				res =  AST_BRIDGE_COMPLETE;
+				res = AST_BRIDGE_COMPLETE;
 				ast_log(LOG_DEBUG, "Got a FRAME_CONTROL (%d) frame on channel %s\n", f->subclass, who->name);
 				break;
 			}



More information about the asterisk-commits mailing list