commit 2b58fbf045acee349c323de8f50501f94c41c04d
author Igor Sysoev <igor@sysoev.ru> Tue Dec 09 15:08:11 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Dec 09 15:08:11 2003 +0000
tree 32c1e5848f1b0945dba64fa29e93bd328d71e146
parent 5f80078c675bc344d12a6a64d97ecafb64de224b

nginx-0.0.1-2003-12-09-18:08:11 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 e438ad3..d36160a 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -122,10 +122,11 @@
             ngx_free(change_list);
         }
 
-        ngx_test_null(change_list,
-                      ngx_alloc(kcf->changes * sizeof(struct kevent),
-                                cycle->log),
-                      NGX_ERROR);
+        change_list = ngx_alloc(kcf->changes * sizeof(struct kevent),
+                                cycle->log);
+        if (change_list == NULL) {
+            return NGX_ERROR;
+        }
     }
 
     max_changes = kcf->changes;
@@ -135,10 +136,11 @@
             ngx_free(event_list);
         }
 
-        ngx_test_null(event_list,
-                      ngx_alloc(kcf->events * sizeof(struct kevent),
-                                cycle->log),
-                      NGX_ERROR);
+        event_list = ngx_alloc(kcf->events * sizeof(struct kevent),
+                                cycle->log);
+        if (event_list == NULL) {
+            return NGX_ERROR;
+        }
     }
 
     nevents = kcf->events;
@@ -371,9 +373,7 @@
         tp = NULL;
     }
 
-#if (NGX_DEBUG_EVENT)
-    ngx_log_debug(log, "kevent timer: %d" _ timer);
-#endif
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "kevent timer: %d", timer);
 
     events = kevent(ngx_kqueue, change_list, nchanges, event_list, nevents, tp);