Hopefully the last round of removing needlock stuff

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
James Golovich 22 years ago
parent 1b2dc7ef75
commit e9c65d0c08

@ -383,7 +383,6 @@ 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);
if (p->owner != oldchan) {
ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
@ -391,7 +390,6 @@ static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
return -1;
}
p->owner = newchan;
if (needlock)
ast_mutex_unlock(&p->lock);
return 0;
}

@ -626,14 +626,12 @@ 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);
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);
return 0;
}

Loading…
Cancel
Save