Mercurial > hg > nginx-quic
comparison src/core/ngx_cycle.c @ 2717:73fe3fe858b9
fix the previous commit
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 17 Apr 2009 19:09:08 +0000 |
parents | d5896f6608e8 |
children | b3b8c66bd520 |
comparison
equal
deleted
inserted
replaced
2716:d5896f6608e8 | 2717:73fe3fe858b9 |
---|---|
480 lock_file = NULL; | 480 lock_file = NULL; |
481 | 481 |
482 #else | 482 #else |
483 | 483 |
484 lock_file = ngx_pnalloc(cycle->pool, | 484 lock_file = ngx_pnalloc(cycle->pool, |
485 cycle->lock_file.len + shm_zone[i].name.len); | 485 cycle->lock_file.len + shm_zone[i].shm.name.len); |
486 | 486 |
487 if (lock_file == NULL) { | 487 if (lock_file == NULL) { |
488 goto failed; | 488 goto failed; |
489 } | 489 } |
490 | 490 |
491 (void) ngx_cpystrn(ngx_cpymem(lock_file, cycle->lock_file.data, | 491 (void) ngx_cpystrn(ngx_cpymem(lock_file, cycle->lock_file.data, |
492 cycle->lock_file.len), | 492 cycle->lock_file.len), |
493 shm_zone[i].name.data, shm_zone[i].name.len + 1); | 493 shm_zone[i].shm.name.data, |
494 shm_zone[i].shm.name.len + 1); | |
494 | 495 |
495 #endif | 496 #endif |
496 | 497 |
497 if (ngx_shmtx_create(&shpool->mutex, (void *) &shpool->lock, lock_file) | 498 if (ngx_shmtx_create(&shpool->mutex, (void *) &shpool->lock, lock_file) |
498 != NGX_OK) | 499 != NGX_OK) |