diff options
Diffstat (limited to 'src/core/ngx_file.c')
| -rw-r--r-- | src/core/ngx_file.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 76e71c748..0c6576087 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -40,8 +40,8 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, { ngx_err_t err; ngx_atomic_uint_t n; - ngx_pool_cleanup_file_t *cln; - + ngx_pool_cleanup_t *cln; + ngx_pool_cleanup_file_t *clnf; file->name.len = path->name.len + 1 + path->len + NGX_ATOMIC_T_LEN; @@ -66,6 +66,11 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, ngx_create_hashed_filename(file, path); + cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)); + if (cln == NULL) { + return NGX_ERROR; + } + #if 1 file->fd = ngx_open_tempfile(file->name.data, persistent); #else @@ -76,19 +81,13 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool, "temp fd:%d", file->fd); if (file->fd != NGX_INVALID_FILE) { - cln = ngx_palloc(pool, sizeof(ngx_pool_cleanup_file_t)); - if (cln == NULL) { - return NGX_ERROR; - } - cln->fd = file->fd; - cln->name = file->name.data; - cln->log = pool->log; + cln->handler = ngx_pool_cleanup_file; + clnf = cln->data; - if (ngx_pool_cleanup_add(pool, ngx_pool_cleanup_file, cln) == NULL) - { - return NGX_ERROR; - } + clnf->fd = file->fd; + clnf->name = file->name.data; + clnf->log = pool->log; return NGX_OK; } |