diff options
| author |   robert <robert@openbsd.org> | 2013-03-17 16:05:30 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2013-03-17 16:05:30 +0000 |
| commit | 9f3c3c8525eca9911b66de0aa79e1d7be73c5c8b (patch) | |
| tree | b011d550d41b8572004322c2189b1dff46623967 /usr.sbin/nginx/src/core/ngx_file.c | |
| parent | Avoid namespace pollution from <powerpc/cpu.h>. (diff) | |
| download | wireguard-openbsd-9f3c3c8525eca9911b66de0aa79e1d7be73c5c8b.tar.xz wireguard-openbsd-9f3c3c8525eca9911b66de0aa79e1d7be73c5c8b.zip | |
update to 1.2.7
Diffstat (limited to 'usr.sbin/nginx/src/core/ngx_file.c')
| -rw-r--r-- | usr.sbin/nginx/src/core/ngx_file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/nginx/src/core/ngx_file.c b/usr.sbin/nginx/src/core/ngx_file.c index f32b734e9c5..69d65d0fd2b 100644 --- a/usr.sbin/nginx/src/core/ngx_file.c +++ b/usr.sbin/nginx/src/core/ngx_file.c @@ -743,14 +743,14 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf) n = ngx_read_fd(fd, buf, len); - if (n == NGX_FILE_ERROR) { + if (n == -1) { ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, ngx_read_fd_n " \"%s\" failed", from); goto failed; } if ((size_t) n != len) { - ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, + ngx_log_error(NGX_LOG_ALERT, cf->log, 0, ngx_read_fd_n " has read only %z of %uz from %s", n, size, from); goto failed; @@ -758,14 +758,14 @@ ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf) n = ngx_write_fd(nfd, buf, len); - if (n == NGX_FILE_ERROR) { + if (n == -1) { ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, ngx_write_fd_n " \"%s\" failed", to); goto failed; } if ((size_t) n != len) { - ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, + ngx_log_error(NGX_LOG_ALERT, cf->log, 0, ngx_write_fd_n " has written only %z of %uz to %s", n, size, to); goto failed; |