kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 14:56:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-09-28 18:01:52 +00:00
parent 93efe68235
commit ae1a27ae61
14 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/app_queue.c
View File

@@ -3306,7 +3306,7 @@ static void reload_queues(void)
struct ast_config *cfg;
char *cat, *tmp;
struct ast_variable *var;
struct member *prev, *cur, *newm;
struct member *prev, *cur, *newm, *next;
int new;
char *general_val = NULL;
char interface[80];
@@ -3405,23 +3405,21 @@ static void reload_queues(void)
}
/* Free remaining members marked as delme */
for (prev = NULL, newm = NULL, cur = q->members; cur; prev = cur, cur = cur->next) {
if (newm) {
free(newm);
newm = NULL;
}
for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL;
cur;
cur = next, next = cur ? cur->next : NULL) {
if (!cur->delme)
continue;
if (cur->delme) {
if (prev) {
prev->next = cur->next;
newm = cur;
} else {
q->members = cur->next;
newm = cur;
}
remove_from_interfaces(cur->interface);
}
if (prev)
prev->next = next;
else
q->members = next;
remove_from_interfaces(cur->interface);
free(cur);
}
if (!new)
ast_mutex_unlock(&q->lock);
if (new) {