diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 17:31:57 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 17:31:57 +0000 |
commit | 85942d51eb58dc2dbb821b97eb3f3b7990ae3780 (patch) | |
tree | d2531462d59dafde6315d24e9cb3d438399dc370 /apps/app_queue.c | |
parent | 8fad293d84cb383103d6aa4fc4507dabc9cfe2c6 (diff) |
fix buggy (and overly complex) loop used during reload of app_queue for static member list updating
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@43916 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r-- | apps/app_queue.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 1a12bceeb..ec53d6641 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -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; - } - - if (cur->delme) { - if (prev) { - prev->next = cur->next; - newm = cur; - } else { - q->members = cur->next; - newm = cur; - } - remove_from_interfaces(cur->interface); - } + for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL; + cur; + cur = next, next = cur ? cur->next : NULL) { + if (!cur->delme) + continue; + + 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) { |