uniform ngx_file_info() interface with ngx_fd_info()
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);
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;
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;
}
diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index f506dde..84a7672 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -221,7 +221,7 @@
temp = &r->request_body->temp_file->file.name;
- if (ngx_file_info(path.data, &fi) == -1) {
+ if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
status = NGX_HTTP_CREATED;
} else {
@@ -326,7 +326,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http delete filename: \"%s\"", path.data);
- if (ngx_file_info(path.data, &fi) == -1) {
+ if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
err = ngx_errno;
rc = (err == NGX_ENOTDIR) ? NGX_HTTP_CONFLICT : NGX_HTTP_NOT_FOUND;
@@ -678,7 +678,7 @@
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http copy to: \"%s\"", copy.path.data);
- if (ngx_file_info(copy.path.data, &fi) == -1) {
+ if (ngx_file_info(copy.path.data, &fi) == NGX_FILE_ERROR) {
err = ngx_errno;
if (err != NGX_ENOENT) {
@@ -712,7 +712,7 @@
dir = ngx_is_dir(&fi);
}
- if (ngx_file_info(path.data, &fi) == -1) {
+ if (ngx_file_info(path.data, &fi) == NGX_FILE_ERROR) {
return ngx_http_dav_error(r->connection->log, ngx_errno,
NGX_HTTP_NOT_FOUND, ngx_file_info_n,
path.data);
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index e10bce3..4397b28 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -311,7 +311,7 @@
/* NT4 and Win98 */
if (GetFileAttributesEx((char *) file, GetFileExInfoStandard, &fa) == 0) {
- return NGX_ERROR;
+ return NGX_FILE_ERROR;
}
sb->dwFileAttributes = fa.dwFileAttributes;
@@ -321,7 +321,7 @@
sb->nFileSizeHigh = fa.nFileSizeHigh;
sb->nFileSizeLow = fa.nFileSizeLow;
- return NGX_OK;
+ return ~NGX_FILE_ERROR;
}
