Mercurial > hg > nginx
comparison src/core/ngx_cycle.c @ 5163:c0497468f521 stable-1.2
Merge of r5138: use of NGX_FILE_ERROR.
Use NGX_FILE_ERROR for handling file operations errors.
On Win32 platforms 0 is used to indicate errors in file operations, so
comparing against either -1 or NGX_OK 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 | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 29 Mar 2013 18:18:42 +0000 |
| parents | 004af18ddb86 |
| children |
comparison
equal
deleted
inserted
replaced
| 5162:ee9a043765ea | 5163:c0497468f521 |
|---|---|
| 677 name = ls[i].addr_text.data + sizeof("unix:") - 1; | 677 name = ls[i].addr_text.data + sizeof("unix:") - 1; |
| 678 | 678 |
| 679 ngx_log_error(NGX_LOG_WARN, cycle->log, 0, | 679 ngx_log_error(NGX_LOG_WARN, cycle->log, 0, |
| 680 "deleting socket %s", name); | 680 "deleting socket %s", name); |
| 681 | 681 |
| 682 if (ngx_delete_file(name) == -1) { | 682 if (ngx_delete_file(name) == NGX_FILE_ERROR) { |
| 683 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, | 683 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, |
| 684 ngx_delete_file_n " %s failed", name); | 684 ngx_delete_file_n " %s failed", name); |
| 685 } | 685 } |
| 686 } | 686 } |
| 687 | 687 |