diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 22:09:23 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 22:09:23 +0400 |
| commit | 67dbb8b8d0820a299f62efeca8ec4be679295732 (patch) | |
| tree | b70e66c28dda0fae3712287cf0a74356642f3325 | |
| parent | 567dc0b265186d146aa71aa9c7d8f74502a0a45a (diff) | |
Merge of r4739: s/ngx_shmtx_destory/ngx_shmtx_destroy/.
| -rw-r--r-- | src/core/ngx_shmtx.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_shmtx.h | 2 |
2 files changed, 4 insertions, 4 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, diff --git a/src/core/ngx_shmtx.h b/src/core/ngx_shmtx.h index 830b6f5b1..91e11bebb 100644 --- a/src/core/ngx_shmtx.h +++ b/src/core/ngx_shmtx.h @@ -39,7 +39,7 @@ typedef struct { 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); |