Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 2736:218b8949f2fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fix: remove tabs
author Igor Sysoev <igor@sysoev.ru>
date Tue, 21 Apr 2009 19:38:02 +0000
parents d43d73277c5c
children ae81441e23f4
comparison
equal deleted inserted replaced
2735:a9d7f8ebdbef 2736:218b8949f2fd
465 goto failed; 465 goto failed;
466 } 466 }
467 467
468 if (!shm_zone[i].shm.exists) { 468 if (!shm_zone[i].shm.exists) {
469 469
470 if (ngx_init_zone_pool(cycle, &shm_zone[i]) != NGX_OK) { 470 if (ngx_init_zone_pool(cycle, &shm_zone[i]) != NGX_OK) {
471 goto failed; 471 goto failed;
472 } 472 }
473 } 473 }
474 474
475 if (shm_zone[i].init(&shm_zone[i], NULL) != NGX_OK) { 475 if (shm_zone[i].init(&shm_zone[i], NULL) != NGX_OK) {
476 goto failed; 476 goto failed;
477 } 477 }
905 905
906 #else 906 #else
907 907
908 file = ngx_pnalloc(cycle->pool, cycle->lock_file.len + zn->shm.name.len); 908 file = ngx_pnalloc(cycle->pool, cycle->lock_file.len + zn->shm.name.len);
909 if (file == NULL) { 909 if (file == NULL) {
910 return NGX_ERROR; 910 return NGX_ERROR;
911 } 911 }
912 912
913 (void) ngx_sprintf(file, "%V%V%Z", &cycle->lock_file, &zn->shm.name); 913 (void) ngx_sprintf(file, "%V%V%Z", &cycle->lock_file, &zn->shm.name);
914 914
915 #endif 915 #endif
916 916
917 if (ngx_shmtx_create(&sp->mutex, (void *) &sp->lock, file) != NGX_OK) { 917 if (ngx_shmtx_create(&sp->mutex, (void *) &sp->lock, file) != NGX_OK) {
918 return NGX_ERROR; 918 return NGX_ERROR;
919 } 919 }
920 920
921 ngx_slab_init(sp); 921 ngx_slab_init(sp);
922 922
923 return NGX_OK; 923 return NGX_OK;