Mercurial > hg > nginx

diff src/core/ngx_conf_file.c @ 2785:d478379e51ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) refactor error_log processing: listen socket log might inherit built-in error_log with zero level, and r2447, r2466, r2467 were not enough *) remove bogus "stderr" level *) some functions and fields renames
author Igor Sysoev <igor@sysoev.ru>
date Thu, 30 Apr 2009 13:53:42 +0000
parents 9b107cdf53f6
children 3e10674139e4
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c	Thu Apr 30 12:43:38 2009 +0000
+++ b/src/core/ngx_conf_file.c	Thu Apr 30 13:53:42 2009 +0000
@@ -858,7 +858,7 @@
     full.data = NULL;
 #endif
 
-    if (name && name->len) {
+    if (name->len) {
         full = *name;
 
         if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) {
@@ -894,14 +894,13 @@
         return NULL;
     }
 
-    if (name && name->len) {
+    if (name->len) {
         file->fd = NGX_INVALID_FILE;
         file->name = full;
 
     } else {
         file->fd = ngx_stderr;
-        file->name.len = 0;
-        file->name.data = NULL;
+        file->name = *name;
     }
 
     file->buffer = NULL;