commit 604e18fb2c97b86b49b93b969d55003c9656f143
author Valentin Bartenev <vbart@nginx.com> Mon Mar 25 15:49:11 2013 +0000
committer Valentin Bartenev <vbart@nginx.com> Mon Mar 25 15:49:11 2013 +0000
tree a93a3ba36cf535d7aed22f8d647e1a2e79a7fde5
parent ea327f13f130be87cf3023e215d1c97b5465343f

Use NGX_FILE_ERROR for handling file operations errors.

On Win32 platforms 0 is used to indicate errors in file operations, so
comparing against -1 is not portable.

This was not much of an issue in patched code, since only ngx_fd_info() test
is actually reachable on Win32 and in worst case it might result in bogus
error log entry.

Patch by Piotr Sikora.

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index dc4dc89..87b6d7d 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -679,7 +679,7 @@
             ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
                           "deleting socket %s", name);
 
-            if (ngx_delete_file(name) == -1) {
+            if (ngx_delete_file(name) == NGX_FILE_ERROR) {
                 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
                               ngx_delete_file_n " %s failed", name);
             }