diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-20 19:14:07 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-20 19:14:07 +0000 |
| commit | 6bb86e3d5852e0d879c2e1f18dc1627172050606 (patch) | |
| tree | dd80d2d098c9bbbfee5082c7148498c6cc586c27 /src/core/ngx_open_file_cache.c | |
| parent | 3c00e341ea348810242bb763d2554a4020b3ecbf (diff) | |
| download | nginx-6bb86e3d5852e0d879c2e1f18dc1627172050606.tar.gz nginx-6bb86e3d5852e0d879c2e1f18dc1627172050606.zip | |
Disable symlinks: error handling cleanup again.
Diffstat (limited to 'src/core/ngx_open_file_cache.c')
| -rw-r--r-- | src/core/ngx_open_file_cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index c871f74b1..acfc0954c 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -590,10 +590,10 @@ ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, NGX_FILE_RDONLY|NGX_FILE_NONBLOCK, NGX_FILE_OPEN, 0); - if (at_fd == NGX_FILE_ERROR) { + if (at_fd == NGX_INVALID_FILE) { of->err = ngx_errno; of->failed = ngx_openat_file_n; - return NGX_FILE_ERROR; + return NGX_INVALID_FILE; } at_name.len = 1; @@ -634,7 +634,7 @@ ngx_open_file_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, if (at_fd != AT_FDCWD && ngx_close_file(at_fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - ngx_close_file_n " \"%V\" failed", at_name); + ngx_close_file_n " \"%V\" failed", &at_name); } p = cp + 1; @@ -692,7 +692,7 @@ failed: if (at_fd != AT_FDCWD && ngx_close_file(at_fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - ngx_close_file_n " \"%V\" failed", at_name); + ngx_close_file_n " \"%V\" failed", &at_name); } return fd; |