From 7578ec9df43bbb31db5291f1b76359d10900a679 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 2 Jun 2003 15:24:30 +0000
Subject: nginx-0.0.1-2003-06-02-19:24:30 import

---
 src/event/ngx_event.h        | 15 ---------------
 src/event/ngx_event_accept.c | 14 +++++++-------
 2 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'src/event')

diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 928d2cf4b..08119a30b 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -5,17 +5,6 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 
-#if 0
-#include <ngx_types.h>
-#include <ngx_time.h>
-#include <ngx_socket.h>
-#include <ngx_log.h>
-#include <ngx_alloc.h>
-#include <ngx_array.h>
-#include <ngx_conf_file.h>
-#endif
-
-
 
 #define NGX_INVALID_INDEX  0x80000000
 
@@ -310,10 +299,6 @@ extern int                   ngx_event_flags;
 #endif
 
 
-#if !(HAVE_EPOLL)
-#define  ngx_edge_add_event(ev)  NGX_ERROR
-#endif
-
 
 #define NGX_EVENT_MODULE      0x544E5645  /* "EVNT" */
 
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index dacd7e427..77ba8edfa 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -1,10 +1,8 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
-
-#include <nginx.h>
-
 #include <ngx_event.h>
+#include <nginx.h>
 
 
 void ngx_event_accept(ngx_event_t *ev)
@@ -30,9 +28,11 @@ void ngx_event_accept(ngx_event_t *ev)
 
     do {
 
-        /* Create the pool before accept() to avoid copy the sockaddr.
-           Although accept() can fail it's uncommon case
-           and the pool can be got from the free pool list */
+        /*
+         * Create the pool before accept() to avoid copy the sockaddr.
+         * Although accept() can fail it's uncommon case
+         * and the pool can be got from the free pool list
+         */
 
         pool = ngx_create_pool(ls->pool_size, ev->log);
         if (pool == NULL) {
@@ -168,7 +168,7 @@ void ngx_event_accept(ngx_event_t *ev)
         ngx_memcpy(c->log, ev->log, sizeof(ngx_log_t));
         rev->log = wev->log = c->log;
 
-        /* STUB: x86: MT: lock xadd, MP: lock xadd, shared */
+        /* TODO: x86: MT: lock xadd, MP: lock xadd, shared */
         c->number = ngx_connection_counter++;
 
         ngx_log_debug(ev->log, "accept: %d, %d" _ s _ c->number);
-- 
cgit