[svn-commits] seanbright: branch seanbright/resolve-shadow-warnings r119462 - in /team/sean...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri May 30 18:39:03 2008
New Revision: 119462

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119462
Log:
Merged revisions 119419,119423 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r119419 | tilghman | 2008-05-30 17:23:14 -0400 (Fri, 30 May 2008) | 14 lines

Merged revisions 119404 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119404 | tilghman | 2008-05-30 16:17:45 -0500 (Fri, 30 May 2008) | 6 lines

When joinempty=strict, it only failed on join if there were busy members.  If
all members were logged out OR paused, then it (incorrectly) let callers join
the queue.
(closes issue #12451)
 Reported by: davidw

........

................
r119423 | russell | 2008-05-30 17:51:17 -0400 (Fri, 30 May 2008) | 3 lines

Fix a minor merge issue that caused a function to not get compiled in with
DEBUG_THREADS like it was supposed to

................

Modified:
    team/seanbright/resolve-shadow-warnings/apps/app_queue.c
    team/seanbright/resolve-shadow-warnings/main/utils.c

Modified: team/seanbright/resolve-shadow-warnings/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_queue.c?view=diff&rev=119462&r1=119461&r2=119462
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_queue.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_queue.c Fri May 30 18:39:03 2008
@@ -1678,9 +1678,9 @@
 	status = get_member_status(q, qe->max_penalty, qe->min_penalty);
 	if (!q->joinempty && (status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINEMPTY;
-	else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS))
+	else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_UNPAUSED_REACHABLE_MEMBERS || status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINUNAVAIL;
-	else if ((q->joinempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS))
+	else if ((q->joinempty == QUEUE_EMPTY_LOOSE) && (status == QUEUE_NO_REACHABLE_MEMBERS || status == QUEUE_NO_MEMBERS))
 		*reason = QUEUE_JOINUNAVAIL;
 	else if (q->maxlen && (q->count >= q->maxlen))
 		*reason = QUEUE_FULL;

Modified: team/seanbright/resolve-shadow-warnings/main/utils.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/main/utils.c?view=diff&rev=119462&r1=119461&r2=119462
==============================================================================
--- team/seanbright/resolve-shadow-warnings/main/utils.c (original)
+++ team/seanbright/resolve-shadow-warnings/main/utils.c Fri May 30 18:39:03 2008
@@ -674,9 +674,7 @@
 	}
 	pthread_mutex_unlock(&lock_info->lock);
 }
-#ifdef HAVE_BKTR
-void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
-#else
+
 int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, const char **func, const char **mutex_name)
 {
 	struct thr_lock_info *lock_info;
@@ -705,6 +703,9 @@
 	return 0;
 }
 
+#ifdef HAVE_BKTR
+void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt)
+#else
 void ast_remove_lock_info(void *lock_addr)
 #endif
 {