style fix: remove tabs and trailing spaces

This commit is contained in:
Igor Sysoev 2008-05-14 07:54:52 +00:00
parent 7a06fbdcca
commit 433608c180
4 changed files with 9 additions and 9 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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;
}

View File

@ -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()
*/