From e9c65d0c08bba0c1fdcbb7878c240ef1c0fca077 Mon Sep 17 00:00:00 2001
From: James Golovich <james@gnuinter.net>
Date: Thu, 8 Apr 2004 19:28:05 +0000
Subject: [PATCH] Hopefully the last round of removing needlock stuff

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_agent.c | 6 ++----
 channels/chan_h323.c  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c12a8581a4..f5c4e3a511 100755
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -383,16 +383,14 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f)
 static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
 {
 	struct agent_pvt *p = newchan->pvt->pvt;
-	if (needlock)
-		ast_mutex_lock(&p->lock);
+	ast_mutex_lock(&p->lock);
 	if (p->owner != oldchan) {
 		ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
 		ast_mutex_unlock(&p->lock);
 		return -1;
 	}
 	p->owner = newchan;
-	if (needlock)
-		ast_mutex_unlock(&p->lock);
+	ast_mutex_unlock(&p->lock);
 	return 0;
 }
 
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index ca68cb6817..b29f6977be 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -626,15 +626,13 @@ static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
 {
 	struct oh323_pvt *p = newchan->pvt->pvt;
 
-	if (needlock)
-		ast_mutex_lock(&p->lock);
+	ast_mutex_lock(&p->lock);
 	if (p->owner != oldchan) {
 		ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
 		return -1;
 	}
 	p->owner = newchan;
-	if (needlock)
-		ast_mutex_unlock(&p->lock);
+	ast_mutex_unlock(&p->lock);
 	return 0;
 }
 
-- 
GitLab