automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index f34e6a0b2c8088e18c2a810d4385c5fdb2514a05..37611e6716747c9b38c633be694de507c1201c75 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -763,20 +763,17 @@ static void rt_handle_member_record(struct ast_call_queue *q, char *interface, c
 static struct ast_call_queue *reload_queue_rt(const char *queuename, struct ast_variable *queue_vars, struct ast_config *member_config)
 {
        struct ast_variable *v;
-       struct ast_call_queue *q, *prev_q;
+       struct ast_call_queue *q, *prev_q = NULL;
        struct member *m, *prev_m, *next_m;
        char *interface;
        char *tmp, *tmp_name;
        char tmpbuf[64];        /* Must be longer than the longest queue param name. */
 
        /* Find the queue in the in-core list (we will create a new one if not found). */
-       q = queues;
-       prev_q = NULL;
-       while (q) {
+       for (q = queues; q; q = q->next) {
                if (!strcasecmp(q->name, queuename)) {
                        break;
                }
-               q = q->next;
                prev_q = q;
        }