mirror of
https://github.com/nginx/nginx.git
synced 2024-11-24 04:49:01 +08:00
style fix: remove tabs and trailing spaces
This commit is contained in:
parent
7a06fbdcca
commit
433608c180
@ -413,13 +413,13 @@ failed:
|
|||||||
|
|
||||||
if (file->count == 0) {
|
if (file->count == 0) {
|
||||||
|
|
||||||
if (file->fd != NGX_INVALID_FILE) {
|
if (file->fd != NGX_INVALID_FILE) {
|
||||||
if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
|
if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
|
||||||
ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
|
ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
|
||||||
ngx_close_file_n " \"%s\" failed",
|
ngx_close_file_n " \"%s\" failed",
|
||||||
file->name);
|
file->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_free(file->name);
|
ngx_free(file->name);
|
||||||
ngx_free(file);
|
ngx_free(file);
|
||||||
|
@ -202,7 +202,7 @@ ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree)
|
|||||||
ngx_queue_remove(&rn->queue);
|
ngx_queue_remove(&rn->queue);
|
||||||
|
|
||||||
for (ctx = rn->waiting; ctx; ctx = next) {
|
for (ctx = rn->waiting; ctx; ctx = next) {
|
||||||
next = ctx->next;
|
next = ctx->next;
|
||||||
|
|
||||||
if (ctx->event) {
|
if (ctx->event) {
|
||||||
ngx_resolver_free(r, ctx->event);
|
ngx_resolver_free(r, ctx->event);
|
||||||
|
@ -2922,7 +2922,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||||||
return NGX_CONF_ERROR;
|
return NGX_CONF_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
conf->resolver = prev->resolver;
|
conf->resolver = prev->resolver;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
#include <sys/param.h> /* ALIGN() */
|
#include <sys/param.h> /* ALIGN() */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
|
* FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user