CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-09-01 02:58:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct plural form for "path" in the whole source base.

Browse source
This commit is contained in:
Andrey Belov 2012-09-28 13:49:26 +00:00
parent b33a316883
commit 8be233c8f2
7 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/ngx_cycle.c
View file

@ -118,18 +118,18 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
}
n = old_cycle->pathes.nelts ? old_cycle->pathes.nelts : 10;
n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10;
cycle->pathes.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *));
if (cycle->pathes.elts == NULL) {
cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *));
if (cycle->paths.elts == NULL) {
ngx_destroy_pool(pool);
return NULL;
}
cycle->pathes.nelts = 0;
cycle->pathes.size = sizeof(ngx_path_t *);
cycle->pathes.nalloc = n;
cycle->pathes.pool = pool;
cycle->paths.nelts = 0;
cycle->paths.size = sizeof(ngx_path_t *);
cycle->paths.nalloc = n;
cycle->paths.pool = pool;
if (old_cycle->open_files.part.nelts) {
@ -334,7 +334,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
}
if (ngx_create_pathes(cycle, ccf->user) != NGX_OK) {
if (ngx_create_paths(cycle, ccf->user) != NGX_OK) {
goto failed;
}

2
src/core/ngx_cycle.h
View file

@ -48,7 +48,7 @@ struct ngx_cycle_s {
ngx_queue_t reusable_connections_queue;
ngx_array_t listening;
ngx_array_t pathes;
ngx_array_t paths;
ngx_list_t open_files;
ngx_list_t shared_memory;

12
src/core/ngx_file.c
View file

@ -412,8 +412,8 @@ ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot)
path = *slot;
p = cf->cycle->pathes.elts;
for (i = 0; i < cf->cycle->pathes.nelts; i++) {
p = cf->cycle->paths.elts;
for (i = 0; i < cf->cycle->paths.nelts; i++) {
if (p[i]->name.len == path->name.len
&& ngx_strcmp(p[i]->name.data, path->name.data) == 0)
{
@ -457,7 +457,7 @@ ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot)
}
}
p = ngx_array_push(&cf->cycle->pathes);
p = ngx_array_push(&cf->cycle->paths);
if (p == NULL) {
return NGX_ERROR;
}
@ -469,14 +469,14 @@ ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot)
ngx_int_t
ngx_create_pathes(ngx_cycle_t *cycle, ngx_uid_t user)
ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user)
{
ngx_err_t err;
ngx_uint_t i;
ngx_path_t **path;
path = cycle->pathes.elts;
for (i = 0; i < cycle->pathes.nelts; i++) {
path = cycle->paths.elts;
for (i = 0; i < cycle->paths.nelts; i++) {
if (ngx_create_dir(path[i]->name.data, 0700) == NGX_FILE_ERROR) {
err = ngx_errno;

2
src/core/ngx_file.h
View file

@ -130,7 +130,7 @@ void ngx_create_hashed_filename(ngx_path_t *path, u_char *file, size_t len);
ngx_int_t ngx_create_path(ngx_file_t *file, ngx_path_t *path);
ngx_err_t ngx_create_full_path(u_char *dir, ngx_uint_t access);
ngx_int_t ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot);
ngx_int_t ngx_create_pathes(ngx_cycle_t *cycle, ngx_uid_t user);
ngx_int_t ngx_create_paths(ngx_cycle_t *cycle, ngx_uid_t user);
ngx_int_t ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to,
ngx_ext_rename_file_t *ext);
ngx_int_t ngx_copy_file(u_char *from, u_char *to, ngx_copy_file_t *cf);