Hopefully the last round of removing needlock stuff
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2663 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
be5bc57ec1
commit
8619665367
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue