diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-14 07:54:52 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-14 07:54:52 +0000 |
| commit | 433608c18072cbaa99deddf4432ab2537397f025 (patch) | |
| tree | abe6c6be7e61bb9c8e19171b5e23e6f153598843 /src | |
| parent | 7a06fbdcca41102de3b5ca0615f91c931cc600b0 (diff) | |
| download | nginx-433608c18072cbaa99deddf4432ab2537397f025.tar.gz nginx-433608c18072cbaa99deddf4432ab2537397f025.zip | |
style fix: remove tabs and trailing spaces
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_open_file_cache.c | 12 | ||||
| -rw-r--r-- | src/core/ngx_resolver.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_posix_config.h | 2 |
4 files changed, 9 insertions, 9 deletions
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); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index f57db3622..cb9eb14c7 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2922,7 +2922,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } } - + conf->resolver = prev->resolver; } diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h index ae6f70f6a..ec7ee944f 100644 --- a/src/os/unix/ngx_posix_config.h +++ b/src/os/unix/ngx_posix_config.h @@ -110,7 +110,7 @@ #include <sys/param.h> /* ALIGN() */ -/* +/* * FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA() */ |