[Asterisk-cvs] asterisk/channels chan_zap.c,1.516,1.517

russell russell
Wed Sep 28 15:22:09 CDT 2005


Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv6367/channels

Modified Files:
	chan_zap.c 
Log Message:
don't declare the priority inside of the for loop so that the priority
can actually be switched at each iteration (issue #5319)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -d -r1.516 -r1.517
--- chan_zap.c	26 Sep 2005 03:14:44 -0000	1.516
+++ chan_zap.c	28 Sep 2005 19:18:48 -0000	1.517
@@ -2938,6 +2938,7 @@
 	int ofd0, ofd1;
 	int oi0, oi1, i0 = -1, i1 = -1, t0, t1;
 	int os0 = -1, os1 = -1;
+	int priority = 0;
 	struct ast_channel *oc0, *oc1;
 	enum ast_bridge_result res;
 
@@ -3110,7 +3111,6 @@
 	for (;;) {
 		struct ast_channel *c0_priority[2] = {c0, c1};
 		struct ast_channel *c1_priority[2] = {c1, c0};
-		int priority = 0;
 
 		/* Here's our main loop...  Start by locking things, looking for private parts, 
 		   and then balking if anything is wrong */




More information about the svn-commits mailing list