diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-07 19:57:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-07 19:57:13 +0000 |
| commit | 27dd6a62bd76983e6bdc5c45e108aae816fac761 (patch) | |
| tree | 105c6ba178513b23dbd41fbb561d42853411ee9f /src/os/win32/ngx_files.c | |
| parent | 03df86a54127aa6ed1c17abb2bae81da5f9deda5 (diff) | |
| download | nginx-27dd6a62bd76983e6bdc5c45e108aae816fac761.tar.gz nginx-27dd6a62bd76983e6bdc5c45e108aae816fac761.zip | |
use malloc() in ngx_win32_rename_file, set crit level instead of error
Diffstat (limited to 'src/os/win32/ngx_files.c')
| -rw-r--r-- | src/os/win32/ngx_files.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index e74dc52ea..9e5feba0e 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -201,14 +201,14 @@ ngx_write_fd(ngx_fd_t fd, void *buf, size_t size) ngx_int_t -ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool) +ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log) { u_char *name; ngx_int_t rc; ngx_uint_t collision; ngx_atomic_uint_t num; - name = ngx_palloc(pool, to->len + 1 + 10 + 1 + sizeof("DELETE")); + name = ngx_alloc(to->len + 1 + 10 + 1 + sizeof("DELETE"), log); if (name == NULL) { return NGX_ERROR; } @@ -230,7 +230,7 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool) collision = 1; - ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "MoveFile() failed"); + ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "MoveFile() failed"); } if (MoveFile((const char *) from->data, (const char *) to->data) == 0) { @@ -241,15 +241,17 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool) } if (DeleteFile((const char *) name) == 0) { - ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "DeleteFile() failed"); + ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "DeleteFile() failed"); } if (rc == NGX_ERROR) { - ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "MoveFile() failed"); + ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "MoveFile() failed"); } /* mutex_unlock() */ + ngx_free(name); + return rc; } |