summaryrefslogtreecommitdiffhomepage
path: root/src/core/ngx_shmtx.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-08-06 18:09:23 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-08-06 18:09:23 +0000
commit67dbb8b8d0820a299f62efeca8ec4be679295732 (patch)
treeb70e66c28dda0fae3712287cf0a74356642f3325 /src/core/ngx_shmtx.c
parent567dc0b265186d146aa71aa9c7d8f74502a0a45a (diff)
downloadnginx-67dbb8b8d0820a299f62efeca8ec4be679295732.tar.gz
nginx-67dbb8b8d0820a299f62efeca8ec4be679295732.tar.bz2
Merge of r4739: s/ngx_shmtx_destory/ngx_shmtx_destroy/.
Diffstat (limited to 'src/core/ngx_shmtx.c')
-rw-r--r--src/core/ngx_shmtx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_shmtx.c b/src/core/ngx_shmtx.c
index 085294a91..6cf7af58a 100644
--- a/src/core/ngx_shmtx.c
+++ b/src/core/ngx_shmtx.c
@@ -44,7 +44,7 @@ ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, u_char *name)
void
-ngx_shmtx_destory(ngx_shmtx_t *mtx)
+ngx_shmtx_destroy(ngx_shmtx_t *mtx)
{
#if (NGX_HAVE_POSIX_SEM)
@@ -208,7 +208,7 @@ ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, u_char *name)
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 @@ ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, u_char *name)
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,