diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_connection.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_open_file_cache.c | 12 | ||||
| -rw-r--r-- | src/core/ngx_resolver.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index ee636825b..48e085ba3 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -1078,7 +1078,7 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid character \"%c\" in \"worker_cpu_affinity\"", ch); - return NGX_CONF_ERROR ; + return NGX_CONF_ERROR; } } diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index d22a08ed2..b49a696f2 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -229,7 +229,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) /* TODO: configurable try number */ - for (tries = 5 ; tries; tries--) { + for (tries = 5; tries; tries--) { failed = 0; /* for each listening socket */ diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index baf546f07..d9ec1881b 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -413,13 +413,13 @@ failed: if (file->count == 0) { - if (file->fd != NGX_INVALID_FILE) { - if (ngx_close_file(file->fd) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno, - ngx_close_file_n " \"%s\" failed", + if (file->fd != NGX_INVALID_FILE) { + if (ngx_close_file(file->fd) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno, + ngx_close_file_n " \"%s\" failed", file->name); - } - } + } + } ngx_free(file->name); ngx_free(file); diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index a5b8efbf6..a7fe056e6 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -202,7 +202,7 @@ ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree) ngx_queue_remove(&rn->queue); for (ctx = rn->waiting; ctx; ctx = next) { - next = ctx->next; + next = ctx->next; if (ctx->event) { ngx_resolver_free(r, ctx->event); |