nginx-0.0.2-2004-03-16-10:10:12 import
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index a890a26..8b675cd 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -176,7 +176,7 @@
#endif
ev->active = 1;
- ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1 : 0;
+ ev->oneshot = (u_char) ((flags & NGX_ONESHOT_EVENT) ? 1 : 0);
event_index[nevents] = ev;
ev->index = nevents;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 03be86a..e46824e 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -126,7 +126,8 @@
static int ngx_event_init(ngx_cycle_t *cycle)
{
- int m, i, fd;
+ ngx_uint_t m, i;
+ ngx_socket_t fd;
ngx_event_t *rev, *wev;
ngx_listening_t *s;
ngx_connection_t *c;
@@ -174,7 +175,7 @@
c = cycle->connections;
for (i = 0; i < cycle->connection_n; i++) {
- c[i].fd = -1;
+ c[i].fd = (ngx_socket_t) -1;
}
cycle->read_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
@@ -250,7 +251,7 @@
return NGX_ERROR;
}
- cycle->old_cycle->connections[fd].fd = -1;
+ cycle->old_cycle->connections[fd].fd = (ngx_socket_t) -1;
}
}
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 8ca468e..84a70be 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -372,7 +372,7 @@
int connections;
int use;
ngx_flag_t multi_accept;
- char *name;
+ u_char *name;
} ngx_event_conf_t;
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 779fdad..ac64cf3 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -6,8 +6,8 @@
typedef struct {
- int flag;
- char *name;
+ int flag;
+ u_char *name;
} ngx_accept_log_ctx_t;
@@ -16,7 +16,7 @@
void ngx_event_accept(ngx_event_t *ev)
{
- int instance, accepted;
+ ngx_uint_t instance, accepted;
socklen_t len;
struct sockaddr *sa;
ngx_err_t err;
@@ -216,8 +216,8 @@
c->sockaddr = sa;
c->socklen = len;
- rev->instance = !instance;
- wev->instance = !instance;
+ rev->instance = (u_char) !instance;
+ wev->instance = (u_char) !instance;
rev->index = NGX_INVALID_INDEX;
wev->index = NGX_INVALID_INDEX;
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 7b5e9a6..6bc238e 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -10,7 +10,8 @@
int ngx_event_connect_peer(ngx_peer_connection_t *pc)
{
- int rc, instance;
+ int rc;
+ ngx_uint_t instance;
u_int event;
time_t now;
ngx_err_t err;
@@ -170,8 +171,8 @@
c->write = wev;
wev->write = 1;
- rev->instance = !instance;
- wev->instance = !instance;
+ rev->instance = (u_char) !instance;
+ wev->instance = (u_char) !instance;
c->log = pc->log;
rev->log = pc->log;
@@ -203,7 +204,7 @@
ngx_memzero(&addr, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
- addr.sin_port = peer->port;
+ addr.sin_port = (u_short) peer->port;
addr.sin_addr.s_addr = peer->addr;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, pc->log, 0,
@@ -224,7 +225,7 @@
ngx_close_socket_n " failed");
}
- c->fd = -1;
+ c->fd = (ngx_socket_t) -1;
return NGX_CONNECT_ERROR;
}
