automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-10-03 21:02:12 +00:00
parent e1fbeb0c7f
commit 41c63cf7f5

View File

@@ -3405,11 +3405,15 @@ static void reload_queues(void)
}
/* 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;