summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2007-10-16 21:51:26 +0000
committerMark Michelson <mmichelson@digium.com>2007-10-16 21:51:26 +0000
commita39404fed27ae2d9f9792ea70a51763f2ce615a8 (patch)
treee5c24c3362903497dc53fd344fb41a41ae83b092 /apps
parentdadfe716e2a90d0e145016f630fea3646f4f7364 (diff)
Fixing the build.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3f14761b4..4c2814241 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3214,10 +3214,9 @@ static int remove_from_queue(const char *queuename, const char *interface)
if ((mem = ao2_find(q->members, &tmpmem, OBJ_POINTER))) {
/* XXX future changes should beware of this assumption!! */
if(!mem->dynamic) {
- res = RES_NOT_DYNAMIC;
ao2_ref(mem, -1);
- ast_mutex_unlock(&q->lock);
- break;
+ ao2_unlock(q);
+ return RES_NOT_DYNAMIC;
}
q->membercount--;
manager_event(EVENT_FLAG_AGENT, "QueueMemberRemoved",
@@ -4844,8 +4843,8 @@ static char *handle_queue_add_member(struct ast_cli_entry *e, int cmd, struct as
ast_cli(a->fd, "Out of memory\n");
return CLI_FAILURE;
case RES_NOT_DYNAMIC:
- ast_cli(fd, "Member not dynamic\n");
- return RESULT_FAILURE;
+ ast_cli(a->fd, "Member not dynamic\n");
+ return CLI_FAILURE;
default:
return CLI_FAILURE;
}