[asterisk-commits] kpfleming: trunk r44299 - in /trunk: ./ apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Oct  3 15:19:32 2006
New Revision: 44299

URL: http://svn.digium.com/view/asterisk?rev=44299&view=rev
Log:
Merged revisions 44298 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44298 | kpfleming | 2006-10-03 15:18:29 -0500 (Tue, 03 Oct 2006) | 10 lines

Merged revisions 44296 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44296 | kpfleming | 2006-10-03 15:14:13 -0500 (Tue, 03 Oct 2006) | 2 lines

fix a logic error in my previous fix to the queue reload code

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=44299&r1=44298&r2=44299&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Oct  3 15:19:32 2006
@@ -3807,11 +3807,15 @@
 				}
 
 				/* Free remaining members marked as delme */
-				for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL;
+				for (prev = NULL, cur = q->members;
 				     cur;
-				     cur = next, next = cur ? cur->next : NULL) {
-					if (!cur->delme)
+				     cur = next) {
+					next = cur->next;
+
+					if (!cur->delme) {
+						prev = cur;
 						continue;
+					}
 
 					if (prev)
 						prev->next = next;