From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 15 Nov 2007 18:15:48 +0000 (+0000)
Subject: Fix trunk breakage due to chan->lock being renamed.
X-Git-Tag: 1.6.0-beta1~3^2~860
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8044dce3c08d66fcb122c1902229eebd5cb997fa;p=thirdparty%2Fasterisk.git

Fix trunk breakage due to chan->lock being renamed.


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

diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index 5a0cc8a9b4..343c47da64 100644
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -340,7 +340,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
 		if (tempchan && (!strcmp(tempchan->tech->type, "Zap")) && (tempchan != chan) ) {
 			ast_verb(3, "Zap channel %s is in-use, monitoring...\n", tempchan->name);
 			ast_copy_string(confstr, tempchan->name, sizeof(confstr));
-			ast_mutex_unlock(&tempchan->lock);
+			ast_channel_unlock(tempchan);
 			if ((tmp = strchr(confstr,'-'))) {
 				*tmp = '\0';
 			}
@@ -351,7 +351,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
 			if (res<0) break;
 			input = res;
 		} else if (tempchan)
-			ast_mutex_unlock(&tempchan->lock);
+			ast_channel_unlock(tempchan);
 		lastchan = tempchan;
 	}
 	return res;