nginx-0.0.1-2002-12-26-10:24:21 import

3 files changed, 14 insertions, 12 deletions

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 91fe4d86b..4f470d307 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -189,7 +189,7 @@ int ngx_devpoll_process_events(ngx_log_t *log)
     ngx_err_t          err;
     ngx_event_t       *ev;
     ngx_connection_t  *c;
-    struct dvpoll      dvpoll;
+    struct dvpoll      dvp;
     struct timeval     tv;
 
     if (timer_queue.timer_next != &timer_queue) {
@@ -212,10 +212,10 @@ int ngx_devpoll_process_events(ngx_log_t *log)
         return NGX_ERROR;
     }
 
-    dvpoll.dp_fds = event_list;
-    dvpoll.dp_nfds = nevents;
-    dvpoll.dp_timeout = timer;
-    events = ioctl(dp, DP_POLL, &dvpoll);
+    dvp.dp_fds = event_list;
+    dvp.dp_nfds = nevents;
+    dvp.dp_timeout = timer;
+    events = ioctl(dp, DP_POLL, &dvp);
 
     if (events == -1) {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "ioctl(DP_POLL) failed");
diff --git a/src/event/modules/ngx_devpoll_module.h b/src/event/modules/ngx_devpoll_module.h
index e0a9df69a..bd906fd49 100644
--- a/src/event/modules/ngx_devpoll_module.h
+++ b/src/event/modules/ngx_devpoll_module.h
@@ -14,14 +14,16 @@ int ngx_devpoll_process_events(ngx_log_t *log);
 
 
 #if 0
-/* DEBUG */
+/* Solaris */
+
 #define POLLREMOVE   0x0800
+
 #define DP_POLL      0xD001
 
 struct dvpoll {
-    struct pollfd* dp_fds;
-    int dp_nfds;
-    int dp_timeout;
+    struct pollfd  *dp_fds;
+    int             dp_nfds;
+    int             dp_timeout;
 };
 
 #endif
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 1dc7a6135..2fabf37fc 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -22,7 +22,7 @@ static int            max_write;
 static int            max_fd;
 #endif
 
-static unsigned int   nevents;
+static u_int          nevents;
 
 static ngx_event_t  **event_index;
 static ngx_event_t  **ready_index;
@@ -174,8 +174,8 @@ int ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
 
 int ngx_select_process_events(ngx_log_t *log)
 {
-    int                i, ready, found, nready;
-    u_int              timer, delta;
+    int                ready, found, nready;
+    u_int              i, timer, delta;
     ngx_event_t       *ev;
     ngx_connection_t  *c;
     struct timeval     tv, *tp;