Mercurial > hg > nginx
changeset 4484:f78a29a2f9e6
Disable symlinks: error handling cleanup again.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 20 Feb 2012 19:14:07 +0000 |
parents | 15e3b7f867a9 |
children | f7d131008e9c |
files | src/core/ngx_open_file_cache.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_open_file_cache.c Mon Feb 20 19:12:48 2012 +0000 +++ b/src/core/ngx_open_file_cache.c Mon Feb 20 19:14:07 2012 +0000 @@ -590,10 +590,10 @@ 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 @@ 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 @@ 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;