[asterisk-commits] mmichelson: trunk r85992 - /trunk/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Oct 16 16:51:26 2007
New Revision: 85992

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85992
Log:
Fixing the build.


Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=85992&r1=85991&r2=85992
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Oct 16 16:51:26 2007
@@ -3214,10 +3214,9 @@
 		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 @@
 		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;
 	}