Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Tilghman Lesher 18 years ago
parent fc74a46ee2
commit 8044dce3c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
apps/app_zapscan.c
Unescape View File

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

Write Preview
Loading…
Cancel
Save