From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 28 Sep 2005 19:18:48 +0000 (+0000)
Subject: don't declare the priority inside of the for loop so that the priority
X-Git-Tag: 1.2.0-beta2~244
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c020accfdb4675682b7ebcb8bf48cb551efb9d1;p=thirdparty%2Fasterisk.git

don't declare the priority inside of the for loop so that the priority
can actually be switched at each iteration (issue #5319)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index c8a897351c..1e005ec79f 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2938,6 +2938,7 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
 	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 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
 	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 */