[Asterisk-code-review] chan unistim: Fix build failure due to ACL changes. (asterisk[master])
Joshua Colp
asteriskteam at digium.com
Tue May 5 13:36:07 CDT 2015
Joshua Colp has uploaded a new change for review.
https://gerrit.asterisk.org/366
Change subject: chan_unistim: Fix build failure due to ACL changes.
......................................................................
chan_unistim: Fix build failure due to ACL changes.
Change-Id: I57081045c72b9fcf12d5c84493278f9272c31b32
---
M channels/chan_unistim.c
1 file changed, 3 insertions(+), 9 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/66/366/1
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 51f811c..be033dd 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -6399,6 +6399,7 @@
{
struct unistim_line *l;
struct unistim_subchannel *sub;
+ struct unistimsession *s;
if (unistimdebug) {
ast_verb(0, "Removing device '%s'\n", d->name);
@@ -6406,25 +6407,18 @@
AST_LIST_LOCK(&d->subs);
AST_LIST_TRAVERSE_SAFE_BEGIN(&d->subs, sub, list){
if (sub->subtype == SUB_REAL) {
- if (!sub) {
- ast_log(LOG_ERROR, "Device '%s' without a subchannel !, aborting\n",
- d->name);
- ast_config_destroy(cfg);
- return 0;
- }
if (sub->owner) {
ast_log(LOG_WARNING,
"Device '%s' was not deleted : a call is in progress. Try again later.\n",
d->name);
- d = d->next;
- continue;
+ return;
}
}
if (sub->subtype == SUB_THREEWAY) {
ast_log(LOG_WARNING,
"Device '%s' with threeway call subchannels allocated, aborting.\n",
d->name);
- break;
+ return;
}
AST_LIST_REMOVE_CURRENT(list);
ast_mutex_destroy(&sub->lock);
--
To view, visit https://gerrit.asterisk.org/366
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57081045c72b9fcf12d5c84493278f9272c31b32
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
More information about the asterisk-code-review
mailing list