commit d4324e62a7dc6f530339cebd5ac11b17f01d6df4
author Igor Sysoev <igor@sysoev.ru> Tue Sep 17 17:49:32 2002 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Sep 17 17:49:32 2002 +0000
tree cc4cf8902e010e3fd91aae36e4b5c369e3c81d94
parent 682bf8e9c04fbe2fc9548985cdec173b6a9dcb27

nginx-0.0.1-2002-09-17-21:49:32 import

src/event/modules/ngx_kqueue_module.c

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 51541d7..aa9d8cb 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -101,7 +101,7 @@
 {
     int              events, i;
     u_int            timer = 0, delta = 0;
-    ngx_event_t      *ev, *nx;
+    ngx_event_t      *ev;
     struct timeval   tv;
     struct timespec  ts, *tp = NULL;
 
@@ -137,17 +137,17 @@
 
     if (timer) {
         if (delta >= timer) {
-            for (ev = timer_queue.timer_next;
-                 ev != &timer_queue && delta >= ev->timer_delta;
-                 /* void */)
-            {
+            for ( ;; ) {
+                ev = timer_queue.timer_next;
+
+                if (ev == &timer_queue || delta < ev->timer_delta)
+                    break;
+
                 delta -= ev->timer_delta;
-                nx = ev->timer_next;
                 ngx_del_timer(ev);
                 ev->timedout = 1;
                 if (ev->event_handler(ev) == NGX_ERROR)
                     ev->close_handler(ev);
-                ev = nx;
             }
 
         } else {