[nginx] svn commit: r4871 - in trunk: auto src/core src/os/unix src/os/win32
defan at nginx.com
defan at nginx.com
Fri Sep 28 13:49:27 UTC 2012
Author: defan
Date: 2012-09-28 13:49:26 +0000 (Fri, 28 Sep 2012)
New Revision: 4871
URL: http://trac.nginx.org/nginx/changeset/4871/nginx
Log:
Correct plural form for "path" in the whole source base.
Modified:
trunk/auto/make
trunk/src/core/ngx_cycle.c
trunk/src/core/ngx_cycle.h
trunk/src/core/ngx_file.c
trunk/src/core/ngx_file.h
trunk/src/os/unix/ngx_process_cycle.c
trunk/src/os/win32/ngx_process_cycle.c
Modified: trunk/auto/make
===================================================================
--- trunk/auto/make 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/auto/make 2012-09-28 13:49:26 UTC (rev 4871)
@@ -49,7 +49,7 @@
ngx_all_srcs="$CORE_SRCS"
-# the core dependences and include pathes
+# the core dependences and include paths
ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
@@ -69,7 +69,7 @@
END
-# the http dependences and include pathes
+# the http dependences and include paths
if [ $HTTP = YES ]; then
@@ -95,7 +95,7 @@
fi
-# the mail dependences and include pathes
+# the mail dependences and include paths
if [ $MAIL = YES ]; then
Modified: trunk/src/core/ngx_cycle.c
===================================================================
--- trunk/src/core/ngx_cycle.c 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/core/ngx_cycle.c 2012-09-28 13:49:26 UTC (rev 4871)
@@ -118,18 +118,18 @@
}
- 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 @@
}
- if (ngx_create_pathes(cycle, ccf->user) != NGX_OK) {
+ if (ngx_create_paths(cycle, ccf->user) != NGX_OK) {
goto failed;
}
Modified: trunk/src/core/ngx_cycle.h
===================================================================
--- trunk/src/core/ngx_cycle.h 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/core/ngx_cycle.h 2012-09-28 13:49:26 UTC (rev 4871)
@@ -48,7 +48,7 @@
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;
Modified: trunk/src/core/ngx_file.c
===================================================================
--- trunk/src/core/ngx_file.c 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/core/ngx_file.c 2012-09-28 13:49:26 UTC (rev 4871)
@@ -412,8 +412,8 @@
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 @@
}
}
- 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_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;
Modified: trunk/src/core/ngx_file.h
===================================================================
--- trunk/src/core/ngx_file.h 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/core/ngx_file.h 2012-09-28 13:49:26 UTC (rev 4871)
@@ -130,7 +130,7 @@
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);
Modified: trunk/src/os/unix/ngx_process_cycle.c
===================================================================
--- trunk/src/os/unix/ngx_process_cycle.c 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/os/unix/ngx_process_cycle.c 2012-09-28 13:49:26 UTC (rev 4871)
@@ -386,8 +386,8 @@
manager = 0;
loader = 0;
- path = ngx_cycle->pathes.elts;
- for (i = 0; i < ngx_cycle->pathes.nelts; i++) {
+ path = ngx_cycle->paths.elts;
+ for (i = 0; i < ngx_cycle->paths.nelts; i++) {
if (path[i]->manager) {
manager = 1;
@@ -1341,8 +1341,8 @@
next = 60 * 60;
- path = ngx_cycle->pathes.elts;
- for (i = 0; i < ngx_cycle->pathes.nelts; i++) {
+ path = ngx_cycle->paths.elts;
+ for (i = 0; i < ngx_cycle->paths.nelts; i++) {
if (path[i]->manager) {
n = path[i]->manager(path[i]->data);
@@ -1370,8 +1370,8 @@
cycle = (ngx_cycle_t *) ngx_cycle;
- 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_terminate || ngx_quit) {
break;
Modified: trunk/src/os/win32/ngx_process_cycle.c
===================================================================
--- trunk/src/os/win32/ngx_process_cycle.c 2012-09-28 13:15:11 UTC (rev 4870)
+++ trunk/src/os/win32/ngx_process_cycle.c 2012-09-28 13:49:26 UTC (rev 4871)
@@ -963,8 +963,8 @@
next = 60 * 60;
- path = ngx_cycle->pathes.elts;
- for (i = 0; i < ngx_cycle->pathes.nelts; i++) {
+ path = ngx_cycle->paths.elts;
+ for (i = 0; i < ngx_cycle->paths.nelts; i++) {
if (path[i]->manager) {
n = path[i]->manager(path[i]->data);
@@ -1002,8 +1002,8 @@
cycle = (ngx_cycle_t *) ngx_cycle;
- 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_terminate || ngx_quit) {
break;
More information about the nginx-devel
mailing list