[nginx] svn commit: r5138 - in trunk/src: core os/unix

[vbart at nginx.com]

Author: vbart
Date: 2013-03-25 15:49:11 +0000 (Mon, 25 Mar 2013)
New Revision: 5138
URL: http://trac.nginx.org/nginx/changeset/5138/nginx

Log:
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.


Modified:
   trunk/src/core/nginx.c
   trunk/src/core/ngx_conf_file.c
   trunk/src/core/ngx_connection.c
   trunk/src/core/ngx_cycle.c
   trunk/src/os/unix/ngx_process_cycle.c

Modified: trunk/src/core/nginx.c
===================================================================
--- trunk/src/core/nginx.c	2013-03-25 14:51:44 UTC (rev 5137)
+++ trunk/src/core/nginx.c	2013-03-25 15:49:11 UTC (rev 5138)
@@ -637,7 +637,7 @@
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 
-    if (ngx_rename_file(ccf->pid.data, ccf->oldpid.data) != NGX_OK) {
+    if (ngx_rename_file(ccf->pid.data, ccf->oldpid.data) == NGX_FILE_ERROR) {
         ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
                       ngx_rename_file_n " %s to %s failed "
                       "before executing new binary process \"%s\"",
@@ -652,7 +652,9 @@
     pid = ngx_execute(cycle, &ctx);
 
     if (pid == NGX_INVALID_PID) {
-        if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data) != NGX_OK) {
+        if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data)
+            == NGX_FILE_ERROR)
+        {
             ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
                           ngx_rename_file_n " %s back to %s failed after "
                           "an attempt to execute new binary process \"%s\"",

Modified: trunk/src/core/ngx_conf_file.c
===================================================================
--- trunk/src/core/ngx_conf_file.c	2013-03-25 14:51:44 UTC (rev 5137)
+++ trunk/src/core/ngx_conf_file.c	2013-03-25 15:49:11 UTC (rev 5138)
@@ -133,7 +133,7 @@
 
         cf->conf_file = &conf_file;
 
-        if (ngx_fd_info(fd, &cf->conf_file->file.info) == -1) {
+        if (ngx_fd_info(fd, &cf->conf_file->file.info) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_EMERG, cf->log, ngx_errno,
                           ngx_fd_info_n " \"%s\" failed", filename->data);
         }

Modified: trunk/src/core/ngx_connection.c
===================================================================
--- trunk/src/core/ngx_connection.c	2013-03-25 14:51:44 UTC (rev 5137)
+++ trunk/src/core/ngx_connection.c	2013-03-25 15:49:11 UTC (rev 5138)
@@ -412,7 +412,7 @@
                 }
 
                 if (ngx_test_config) {
-                    if (ngx_delete_file(name) == -1) {
+                    if (ngx_delete_file(name) == NGX_FILE_ERROR) {
                         ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                                       ngx_delete_file_n " %s failed", name);
                     }
@@ -739,7 +739,7 @@
         {
             u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1;
 
-            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);
             }

Modified: trunk/src/core/ngx_cycle.c
===================================================================
--- trunk/src/core/ngx_cycle.c	2013-03-25 14:51:44 UTC (rev 5137)
+++ trunk/src/core/ngx_cycle.c	2013-03-25 15:49:11 UTC (rev 5138)
@@ -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);
             }

Modified: trunk/src/os/unix/ngx_process_cycle.c
===================================================================
--- trunk/src/os/unix/ngx_process_cycle.c	2013-03-25 14:51:44 UTC (rev 5137)
+++ trunk/src/os/unix/ngx_process_cycle.c	2013-03-25 15:49:11 UTC (rev 5138)
@@ -647,7 +647,7 @@
 
                 if (ngx_rename_file((char *) ccf->oldpid.data,
                                     (char *) ccf->pid.data)
-                    != NGX_OK)
+                    == NGX_FILE_ERROR)
                 {
                     ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
                                   ngx_rename_file_n " %s back to %s failed "