Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 4870:8a9b7b4e9f2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct plural form for "path" in the whole source base.
author Andrey Belov <defan@nginx.com>
date Fri, 28 Sep 2012 13:49:26 +0000
parents 2b129bb067b5
children 72e11139760b
comparison
equal deleted inserted replaced
4869:2b129bb067b5 4870:8a9b7b4e9f2d
116 ngx_destroy_pool(pool); 116 ngx_destroy_pool(pool);
117 return NULL; 117 return NULL;
118 } 118 }
119 119
120 120
121 n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10; 121 n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10;
122 122
123 cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)); 123 cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *));
124 if (cycle->pathes.elts == NULL) { 124 if (cycle->paths.elts == NULL) {
125 ngx_destroy_pool(pool); 125 ngx_destroy_pool(pool);
126 return NULL; 126 return NULL;
127 } 127 }
128 128
129 cycle->pathes.nelts = 0; 129 cycle->paths.nelts = 0;
130 cycle->pathes.size = sizeof(ngx_path_t *); 130 cycle->paths.size = sizeof(ngx_path_t *);
131 cycle->pathes.nalloc = n; 131 cycle->paths.nalloc = n;
132 cycle->pathes.pool = pool; 132 cycle->paths.pool = pool;
133 133
134 134
135 if (old_cycle->open_files.part.nelts) { 135 if (old_cycle->open_files.part.nelts) {
136 n = old_cycle->open_files.part.nelts; 136 n = old_cycle->open_files.part.nelts;
137 for (part = old_cycle->open_files.part.next; part; part = part->next) { 137 for (part = old_cycle->open_files.part.next; part; part = part->next) {
332 if (ngx_test_lockfile(cycle->lock_file.data, log) != NGX_OK) { 332 if (ngx_test_lockfile(cycle->lock_file.data, log) != NGX_OK) {
333 goto failed; 333 goto failed;
334 } 334 }
335 335
336 336
337 if (ngx_create_pathes(cycle, ccf->user) != NGX_OK) { 337 if (ngx_create_paths(cycle, ccf->user) != NGX_OK) {
338 goto failed; 338 goto failed;
339 } 339 }
340 340
341 341
342 if (cycle->new_log.file == NULL) { 342 if (cycle->new_log.file == NULL) {