Mercurial > hg > nginx
comparison src/core/ngx_connection.c @ 5137:f941cf265cc5
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.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Mon, 25 Mar 2013 15:49:11 +0000 |
| parents | a29c574d61fa |
| children | 05ba5bce31e0 462ae7eedc68 |
comparison
equal
deleted
inserted
replaced
| 5136:88a302caca75 | 5137:f941cf265cc5 |
|---|---|
| 410 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, | 410 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, |
| 411 "chmod() \"%s\" failed", name); | 411 "chmod() \"%s\" failed", name); |
| 412 } | 412 } |
| 413 | 413 |
| 414 if (ngx_test_config) { | 414 if (ngx_test_config) { |
| 415 if (ngx_delete_file(name) == -1) { | 415 if (ngx_delete_file(name) == NGX_FILE_ERROR) { |
| 416 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, | 416 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, |
| 417 ngx_delete_file_n " %s failed", name); | 417 ngx_delete_file_n " %s failed", name); |
| 418 } | 418 } |
| 419 } | 419 } |
| 420 } | 420 } |
| 737 && ngx_process <= NGX_PROCESS_MASTER | 737 && ngx_process <= NGX_PROCESS_MASTER |
| 738 && ngx_new_binary == 0) | 738 && ngx_new_binary == 0) |
| 739 { | 739 { |
| 740 u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1; | 740 u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1; |
| 741 | 741 |
| 742 if (ngx_delete_file(name) == -1) { | 742 if (ngx_delete_file(name) == NGX_FILE_ERROR) { |
| 743 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, | 743 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, |
| 744 ngx_delete_file_n " %s failed", name); | 744 ngx_delete_file_n " %s failed", name); |
| 745 } | 745 } |
| 746 } | 746 } |
| 747 | 747 |