]> git.kaiwu.me - nginx.git/commitdiff
style fix: remove tabs and trailing spaces
authorIgor Sysoev <igor@sysoev.ru>
Wed, 14 May 2008 07:54:52 +0000 (07:54 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Wed, 14 May 2008 07:54:52 +0000 (07:54 +0000)
src/core/ngx_open_file_cache.c
src/core/ngx_resolver.c
src/http/ngx_http_core_module.c
src/os/unix/ngx_posix_config.h

index baf546f074aebe3cd079dede6a072dc819f26b6f..d9ec1881bf03ff173b44c6d272117596d62f5c7f 100644 (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);
index a5b8efbf6754d3122cab9c02d279ec0b3c088cbe..a7fe056e68326d9642960179565f2d46d07e7aa5 100644 (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);
index f57db362247498e663c11140513d8495e37afdf5..cb9eb14c764afddfad0f414205f70001b5f84d01 100644 (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;
     }
 
index ae6f70f6a8a04e935f748cc520d9b292e77ad5ec..ec7ee944f0b27a67103105736fe2bc19df481d3b 100644 (file)
 
 #include <sys/param.h>          /* ALIGN() */
 
-/* 
+/*
  * FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
  */