mirror of
https://github.com/nginx/nginx.git
synced 2024-12-28 09:51:04 -06:00
shorten temporary names on 64-bit platforms
This commit is contained in:
parent
e31625b60e
commit
b8bfa20c91
@ -39,8 +39,8 @@ ngx_int_t
|
|||||||
ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
|
ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
|
||||||
ngx_uint_t persistent, ngx_uint_t clean, ngx_uint_t access)
|
ngx_uint_t persistent, ngx_uint_t clean, ngx_uint_t access)
|
||||||
{
|
{
|
||||||
|
uint32_t n;
|
||||||
ngx_err_t err;
|
ngx_err_t err;
|
||||||
ngx_atomic_uint_t n;
|
|
||||||
ngx_pool_cleanup_t *cln;
|
ngx_pool_cleanup_t *cln;
|
||||||
ngx_pool_cleanup_file_t *clnf;
|
ngx_pool_cleanup_file_t *clnf;
|
||||||
|
|
||||||
@ -59,11 +59,11 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
|
|||||||
|
|
||||||
ngx_memcpy(file->name.data, path->name.data, path->name.len);
|
ngx_memcpy(file->name.data, path->name.data, path->name.len);
|
||||||
|
|
||||||
n = ngx_next_temp_number(0);
|
n = (uint32_t) ngx_next_temp_number(0);
|
||||||
|
|
||||||
for ( ;; ) {
|
for ( ;; ) {
|
||||||
(void) ngx_sprintf(file->name.data + path->name.len + 1 + path->len,
|
(void) ngx_sprintf(file->name.data + path->name.len + 1 + path->len,
|
||||||
"%0muA%Z", n);
|
"%010uD%Z", n);
|
||||||
|
|
||||||
ngx_create_hashed_filename(file, path);
|
ngx_create_hashed_filename(file, path);
|
||||||
|
|
||||||
@ -92,7 +92,7 @@ ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, ngx_pool_t *pool,
|
|||||||
err = ngx_errno;
|
err = ngx_errno;
|
||||||
|
|
||||||
if (err == NGX_EEXIST) {
|
if (err == NGX_EEXIST) {
|
||||||
n = ngx_next_temp_number(1);
|
n = (uint32_t) ngx_next_temp_number(1);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user