Mercurial > hg > nginx
changeset 3043:a66d6dfd53f1
style fix
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 25 Aug 2009 09:06:21 +0000 |
parents | 9af37a49adf9 |
children | a1d54c705f38 |
files | src/event/modules/ngx_aio_module.c src/event/modules/ngx_devpoll_module.c src/event/modules/ngx_epoll_module.c src/event/modules/ngx_kqueue_module.c src/event/modules/ngx_poll_module.c src/event/modules/ngx_select_module.c src/event/modules/ngx_win32_select_module.c |
diffstat | 7 files changed, 6 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/modules/ngx_aio_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_aio_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -73,7 +73,6 @@ }; - #if (NGX_HAVE_KQUEUE) static ngx_int_t
--- a/src/event/modules/ngx_devpoll_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_devpoll_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -369,11 +369,7 @@ dvp.dp_timeout = timer; events = ioctl(dp, DP_POLL, &dvp); - if (events == -1) { - err = ngx_errno; - } else { - err = 0; - } + err = (events == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);
--- a/src/event/modules/ngx_epoll_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_epoll_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -401,11 +401,7 @@ events = epoll_wait(ep, event_list, (int) nevents, timer); - if (events == -1) { - err = ngx_errno; - } else { - err = 0; - } + err = (events == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);
--- a/src/event/modules/ngx_kqueue_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_kqueue_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -113,7 +113,6 @@ }; - static ngx_int_t ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer) { @@ -537,11 +536,7 @@ events = kevent(ngx_kqueue, change_list, n, event_list, (int) nevents, tp); - if (events == -1) { - err = ngx_errno; - } else { - err = 0; - } + err = (events == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);
--- a/src/event/modules/ngx_poll_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_poll_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -260,11 +260,7 @@ ready = poll(event_list, (u_int) nevents, (int) timer); - if (ready == -1) { - err = ngx_errno; - } else { - err = 0; - } + err = (ready == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);
--- a/src/event/modules/ngx_select_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_select_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -260,11 +260,7 @@ ready = select(max_fd + 1, &work_read_fd_set, &work_write_fd_set, NULL, tp); - if (ready == -1) { - err = ngx_socket_errno; - } else { - err = 0; - } + err = (ready == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);
--- a/src/event/modules/ngx_win32_select_module.c Tue Aug 25 08:47:58 2009 +0000 +++ b/src/event/modules/ngx_win32_select_module.c Tue Aug 25 09:06:21 2009 +0000 @@ -266,11 +266,7 @@ ready = 0; } - if (ready == -1) { - err = ngx_socket_errno; - } else { - err = 0; - } + err = (ready == -1) ? ngx_socket_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0);