Archived
14
0
Fork 0

Fix locking in zapscan

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3251 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-06-21 04:08:54 +00:00
parent 47561cd6e0
commit 0422554bb0

View file

@ -72,10 +72,7 @@ static struct ast_channel *get_zap_channel_locked(int num) {
ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c);
}
if (c)
return c;
return NULL;
return c;
}
static int careful_write(int fd, unsigned char *data, int len)
@ -334,7 +331,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
res = conf_run(chan, confno, confflags);
if (res<0) break;
input = res;
}
} else if (tempchan)
ast_mutex_unlock(&tempchan->lock);
lastchan = tempchan;
}
LOCAL_USER_REMOVE(u);