commit 016b85270268989d769bade2004a7c628a47d726
author Igor Sysoev <igor@sysoev.ru> Thu Aug 29 16:59:54 2002 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Aug 29 16:59:54 2002 +0000
tree e5054a784236d0087b0a5f2cb473a082cfd6023f
parent 0ad17c09032bdfbc67cd1239b43107edc9d55a52

nginx-0.0.1-2002-08-29-20:59:54 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 f7dee18..1ea3d22 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -8,6 +8,7 @@
 */
 
 #include <ngx_config.h>
+#include <ngx_core.h>
 #include <ngx_types.h>
 #include <ngx_log.h>
 #include <ngx_connection.h>
@@ -19,7 +20,6 @@
 #endif
 
 static void ngx_add_timer_core(ngx_event_t *ev, u_int timer);
-static void ngx_inline ngx_del_timer(ngx_event_t *ev);
 
 
 static int              kq;
@@ -145,7 +145,7 @@
     }
 
     ngx_log_debug(log, "ngx_kqueue_process_events: "
-                       "timer: %d, delta: %d" _ timer _ delta);
+                  "timer: %d, delta: %d" _ timer _ delta);
 
     if (timer) {
         if (delta >= timer) {
@@ -158,7 +158,7 @@
                 ngx_del_timer(ev);
 #if 1
                 ev->timedout = 1;
-                if (ev->event_handler(ev) == -1)
+                if (ev->event_handler(ev) == NGX_ERROR)
                     ev->close_handler(ev);
 #else
                 if (ev->timer_handler(ev) == -1)
@@ -200,7 +200,7 @@
                 ev->error = event_list[i].fflags;
             }
 
-            if (ev->event_handler(ev) == -1)
+            if (ev->event_handler(ev) == NGX_ERROR)
                 ev->close_handler(ev);
 
             break;
@@ -233,6 +233,7 @@
     e->timer_prev = ev;
 }
 
+#if 0
 static void ngx_inline ngx_del_timer(ngx_event_t *ev)
 {
     if (ev->timer_prev)
@@ -240,9 +241,10 @@
 
     if (ev->timer_next) {
         ev->timer_next->timer_prev = ev->timer_prev;
-        ev->timer_prev = NULL;
+        ev->timer_next = NULL;
     }
 
     if (ev->timer_prev)
-        ev->timer_next = NULL;
+        ev->timer_prev = NULL;
 }
+#endif