diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-09-25 14:17:28 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-25 14:17:28 +0000 |
| commit | 48a28e2dad8d5190ebae5dbe2f7779f8e17884a1 (patch) | |
| tree | 9aff32418924dac3e1f8c479904a2c2c6e6fa909 | |
| parent | 38a7faadfedd84ea7212d69ed610d06022e83928 (diff) | |
| download | nginx-48a28e2dad8d5190ebae5dbe2f7779f8e17884a1.tar.gz nginx-48a28e2dad8d5190ebae5dbe2f7779f8e17884a1.zip | |
uniform ngx_directio_on/off() interface with other file functions
| -rw-r--r-- | src/core/ngx_open_file_cache.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_output_chain.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_files.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index aa87fd22c..5f6e0b263 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -525,7 +525,7 @@ ngx_open_and_stat_file(u_char *name, ngx_open_file_info_t *of, ngx_log_t *log) of->fd = fd; if (of->directio <= ngx_file_size(&fi)) { - if (ngx_directio_on(fd) == -1) { + if (ngx_directio_on(fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, ngx_directio_on_n " \"%s\" failed", name); diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index 590da4f45..3ff25ff76 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -514,7 +514,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx) #if (NGX_HAVE_ALIGNED_DIRECTIO) if (ctx->unaligned) { - if (ngx_directio_off(src->file->fd) == -1) { + if (ngx_directio_off(src->file->fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, ngx_errno, ngx_directio_off_n " \"%s\" failed", src->file->name.data); @@ -550,7 +550,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx) err = ngx_errno; - if (ngx_directio_on(src->file->fd) == -1) { + if (ngx_directio_on(src->file->fd) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, ngx_errno, ngx_directio_on_n " \"%s\" failed", src->file->name.data); diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c index d4bf0436f..2154bed49 100644 --- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -406,7 +406,7 @@ ngx_directio_on(ngx_fd_t fd) flags = fcntl(fd, F_GETFL); if (flags == -1) { - return -1; + return NGX_FILE_ERROR; } return fcntl(fd, F_SETFL, flags | O_DIRECT); @@ -421,7 +421,7 @@ ngx_directio_off(ngx_fd_t fd) flags = fcntl(fd, F_GETFL); if (flags == -1) { - return -1; + return NGX_FILE_ERROR; } return fcntl(fd, F_SETFL, flags & ~O_DIRECT); diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index bfbb98fb0..70cab2f1c 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -479,14 +479,14 @@ ngx_de_link_info(u_char *name, ngx_dir_t *dir) ngx_int_t ngx_directio_on(ngx_fd_t fd) { - return 0; + return ~NGX_FILE_ERROR; } ngx_int_t ngx_directio_off(ngx_fd_t fd) { - return 0; + return ~NGX_FILE_ERROR; } |