diff options
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/nginx.rc | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.c | 8 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsarecv_chain.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsasend_chain.c | 14 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/os/win32/nginx.rc b/src/os/win32/nginx.rc index fee869a24..8aa6ff595 100644 --- a/src/os/win32/nginx.rc +++ b/src/os/win32/nginx.rc @@ -6,7 +6,7 @@ nginx icon discardable "src\\os\\win32\\nginx.ico" tray icon discardable "src\\os\\win32\\nginx_tray.ico" -nginx menu discardable +nginx menu discardable begin popup "&nginx" begin diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index 78b7f957d..dcffca7ea 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -281,11 +281,11 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1); dir->dir = FindFirstFile((const char *) name->data, &dir->fd); - + if (dir->dir == INVALID_HANDLE_VALUE) { - return NGX_ERROR; + return NGX_ERROR; } - + dir->valid_info = 1; dir->ready = 1; @@ -305,7 +305,7 @@ ngx_read_dir(ngx_dir_t *dir) return NGX_ERROR; } - return NGX_OK; + return NGX_OK; } diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index be363e258..05fa73cd0 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -85,7 +85,7 @@ ngx_single_process_cycle(ngx_cycle_t *cycle) if (ngx_init_threads(ngx_threads_n, ccf->thread_stack_size, cycle) == NGX_ERROR) - { + { /* fatal */ exit(2); } @@ -134,7 +134,7 @@ ngx_single_process_cycle(ngx_cycle_t *cycle) } - wc.style = CS_HREDRAW|CS_VREDRAW; + wc.style = CS_HREDRAW|CS_VREDRAW; wc.lpfnWndProc = ngx_window_procedure; wc.cbClsExtra = 0; wc.cbWndExtra = 0; diff --git a/src/os/win32/ngx_wsarecv_chain.c b/src/os/win32/ngx_wsarecv_chain.c index c22a08df7..4bdac4247 100644 --- a/src/os/win32/ngx_wsarecv_chain.c +++ b/src/os/win32/ngx_wsarecv_chain.c @@ -9,7 +9,7 @@ #include <ngx_event.h> -#define NGX_WSABUFS 8 +#define NGX_WSABUFS 8 ssize_t @@ -34,7 +34,7 @@ ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain) vec.elts = wsabufs; vec.nelts = 0; vec.size = sizeof(WSABUF); - vec.nalloc = NGX_WSABUFS; + vec.nalloc = NGX_WSABUFS; vec.pool = c->pool; /* coalesce the neighbouring bufs */ diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c index bc3b01574..03c5aa959 100644 --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -48,7 +48,7 @@ ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) vec.elts = wsabufs; vec.size = sizeof(WSABUF); - vec.nalloc = NGX_WSABUFS; + vec.nalloc = NGX_WSABUFS; vec.pool = c->pool; for ( ;; ) { @@ -187,7 +187,7 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) { limit = NGX_MAX_UINT32_VALUE - ngx_pagesize; } - + /* * WSABUFs must be 4-byte aligned otherwise * WSASend() will return undocumented WSAEINVAL error. @@ -196,13 +196,13 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) vec.elts = wsabufs; vec.nelts = 0; vec.size = sizeof(WSABUF); - vec.nalloc = NGX_WSABUFS; + vec.nalloc = NGX_WSABUFS; vec.pool = c->pool; send = 0; prev = NULL; wsabuf = NULL; - + /* create the WSABUF and coalesce the neighbouring bufs */ for (cl = in; @@ -238,7 +238,7 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ovlp = (LPWSAOVERLAPPED) &c->write->ovlp; ngx_memzero(ovlp, sizeof(WSAOVERLAPPED)); - + rc = WSASend(c->fd, vec.elts, vec.nelts, &sent, 0, ovlp, NULL); wev->complete = 0; @@ -257,7 +257,7 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) ngx_connection_error(c, err, "WSASend() failed"); return NGX_CHAIN_ERROR; } - + } else if (ngx_event_flags & NGX_USE_IOCP_EVENT) { /* @@ -293,7 +293,7 @@ ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) &sent, 0, NULL) == 0) { ngx_connection_error(c, ngx_socket_errno, "WSASend() or WSAGetOverlappedResult() failed"); - + return NGX_CHAIN_ERROR; } } |