aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-08-25 09:06:21 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-08-25 09:06:21 +0000
commit8e7e69e3517f197f369e77f3f4613135cd1f3636 (patch)
treed4520b2706cd338bb036b47b70e7b85c53eb17ae /src
parent79fb302daf79e0ffc06c1ba32f28091b762a09a2 (diff)
downloadnginx-8e7e69e3517f197f369e77f3f4613135cd1f3636.tar.gz
nginx-8e7e69e3517f197f369e77f3f4613135cd1f3636.zip
style fix
Diffstat (limited to 'src')
-rw-r--r--src/event/modules/ngx_aio_module.c1
-rw-r--r--src/event/modules/ngx_devpoll_module.c6
-rw-r--r--src/event/modules/ngx_epoll_module.c6
-rw-r--r--src/event/modules/ngx_kqueue_module.c7
-rw-r--r--src/event/modules/ngx_poll_module.c6
-rw-r--r--src/event/modules/ngx_select_module.c6
-rw-r--r--src/event/modules/ngx_win32_select_module.c6
7 files changed, 6 insertions, 32 deletions
diff --git a/src/event/modules/ngx_aio_module.c b/src/event/modules/ngx_aio_module.c
index d1518eded..a4d40d828 100644
--- a/src/event/modules/ngx_aio_module.c
+++ b/src/event/modules/ngx_aio_module.c
@@ -73,7 +73,6 @@ ngx_module_t ngx_aio_module = {
};
-
#if (NGX_HAVE_KQUEUE)
static ngx_int_t
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 657886268..3dd22303f 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -369,11 +369,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
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);
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index b3267b37d..75fc736e7 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -401,11 +401,7 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
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);
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index a84fc8fe1..7250830d3 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -113,7 +113,6 @@ ngx_module_t ngx_kqueue_module = {
};
-
static ngx_int_t
ngx_kqueue_init(ngx_cycle_t *cycle, ngx_msec_t timer)
{
@@ -537,11 +536,7 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
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);
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index db9c41945..e45942b91 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -260,11 +260,7 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags)
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);
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index a09712bfa..5d00ecfb9 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -260,11 +260,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
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);
diff --git a/src/event/modules/ngx_win32_select_module.c b/src/event/modules/ngx_win32_select_module.c
index 768c60ccb..bfcc0e2e5 100644
--- a/src/event/modules/ngx_win32_select_module.c
+++ b/src/event/modules/ngx_win32_select_module.c
@@ -266,11 +266,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer,
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);