[nginx] svn commit: r4808 - in branches/stable-1.2: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 18:09:23 +0000 (Mon, 06 Aug 2012)
New Revision: 4808
URL: http://trac.nginx.org/nginx/changeset/4808/nginx

Log:
Merge of r4739: s/ngx_shmtx_destory/ngx_shmtx_destroy/.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/core/ngx_shmtx.c
   branches/stable-1.2/src/core/ngx_shmtx.h

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 17:38:12 UTC (rev 4807)
+++ branches/stable-1.2	2012-08-06 18:09:23 UTC (rev 4808)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4771,4775
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775
\ No newline at end of property
Modified: branches/stable-1.2/src/core/ngx_shmtx.c
===================================================================
--- branches/stable-1.2/src/core/ngx_shmtx.c	2012-08-06 17:38:12 UTC (rev 4807)
+++ branches/stable-1.2/src/core/ngx_shmtx.c	2012-08-06 18:09:23 UTC (rev 4808)
@@ -44,7 +44,7 @@
 
 
 void
-ngx_shmtx_destory(ngx_shmtx_t *mtx)
+ngx_shmtx_destroy(ngx_shmtx_t *mtx)
 {
 #if (NGX_HAVE_POSIX_SEM)
 
@@ -208,7 +208,7 @@
             return NGX_OK;
         }
 
-        ngx_shmtx_destory(mtx);
+        ngx_shmtx_destroy(mtx);
     }
 
     mtx->fd = ngx_open_file(name, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN,
@@ -232,7 +232,7 @@
 
 
 void
-ngx_shmtx_destory(ngx_shmtx_t *mtx)
+ngx_shmtx_destroy(ngx_shmtx_t *mtx)
 {
     if (ngx_close_file(mtx->fd) == NGX_FILE_ERROR) {
         ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,

Modified: branches/stable-1.2/src/core/ngx_shmtx.h
===================================================================
--- branches/stable-1.2/src/core/ngx_shmtx.h	2012-08-06 17:38:12 UTC (rev 4807)
+++ branches/stable-1.2/src/core/ngx_shmtx.h	2012-08-06 18:09:23 UTC (rev 4808)
@@ -39,7 +39,7 @@
 
 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr,
     u_char *name);
-void ngx_shmtx_destory(ngx_shmtx_t *mtx);
+void ngx_shmtx_destroy(ngx_shmtx_t *mtx);
 ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx);
 void ngx_shmtx_lock(ngx_shmtx_t *mtx);
 void ngx_shmtx_unlock(ngx_shmtx_t *mtx);