commit ef919756d9970902117af563e7e93465f610e600
author Igor Sysoev <igor@sysoev.ru> Wed Apr 29 19:28:52 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Apr 29 19:28:52 2009 +0000
tree 3b4c29a934718617bf57606321381f9a824ef8ef
parent b1e640a3859bb7b5357afe16b0d3791916690e24

uniform ngx_file_info() interface with ngx_fd_info()

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 10d0771..15f8e8d 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1126,7 +1126,9 @@
         if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) {
             ngx_file_info_t  fi;
 
-            if (ngx_file_info((const char *) file[i].name.data, &fi) == -1) {
+            if (ngx_file_info((const char *) file[i].name.data, &fi)
+                == NGX_FILE_ERROR)
+            {
                 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                               ngx_file_info_n " \"%s\" failed",
                               file[i].name.data);

src/core/ngx_file.c

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 6bff833..450da56 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -489,7 +489,9 @@
         {
         ngx_file_info_t   fi;
 
-        if (ngx_file_info((const char *) path[i]->name.data, &fi) == -1) {
+        if (ngx_file_info((const char *) path[i]->name.data, &fi)
+            == NGX_FILE_ERROR)
+        {
             ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                           ngx_file_info_n " \"%s\" failed", path[i]->name.data);
             return NGX_ERROR;

src/core/ngx_open_file_cache.c

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index 6deb0ce..e0b434b 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -143,7 +143,7 @@
 
         if (of->test_only) {
 
-            if (ngx_file_info(name->data, &fi) == -1) {
+            if (ngx_file_info(name->data, &fi) == NGX_FILE_ERROR) {
                 of->err = ngx_errno;
                 of->failed = ngx_file_info_n;
                 return NGX_ERROR;
@@ -463,7 +463,7 @@
 
     if (of->fd != NGX_INVALID_FILE) {
 
-        if (ngx_file_info(name, &fi) == -1) {
+        if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) {
             of->failed = ngx_file_info_n;
             goto failed;
         }
@@ -474,7 +474,7 @@
 
     } else if (of->test_dir) {
 
-        if (ngx_file_info(name, &fi) == -1) {
+        if (ngx_file_info(name, &fi) == NGX_FILE_ERROR) {
             of->failed = ngx_file_info_n;
             goto failed;
         }