Merged revisions 43919 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43919 | kpfleming | 2006-09-28 12:35:42 -0500 (Thu, 28 Sep 2006) | 10 lines

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

........
r43916 | kpfleming | 2006-09-28 12:31:57 -0500 (Thu, 28 Sep 2006) | 2 lines

fix buggy (and overly complex) loop used during reload of app_queue for static member list updating

........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43921 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 70d2729..dc33f4f 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3671,7 +3671,7 @@ static int 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;
        const char *general_val = NULL;
        char parse[80];
@@ -3788,22 +3788,19 @@ static int 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 (prev)
+                                               prev->next = next;
+                                       else
+                                               q->members = next;
 
-                                       if (cur->delme) {
-                                               if (prev) {
-                                                       prev->next = cur->next;
-                                                       newm = cur;
-                                               } else {
-                                                       q->members = cur->next;
-                                                       newm = cur;
-                                               }
-                                               remove_from_interfaces(cur->interface);
-                                       }
+                                       remove_from_interfaces(cur->interface);
+                                       free(cur);
                                }
 
                                if (new) {