Commit 67dbb8b8d0820a299f62efeca8ec4be679295732 - nginx

Merge of r4739: s/ngx_shmtx_destory/ngx_shmtx_destroy/. Maxim Dounin 9 years ago

2 changed file(s) with 4 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

-3

src/core/ngx_shmtx.c less more

43	43
44	44
45	45	void
46		ngx_shmtx_destory(ngx_shmtx_t *mtx)
	46	ngx_shmtx_destroy(ngx_shmtx_t *mtx)
47	47	{
48	48	#if (NGX_HAVE_POSIX_SEM)
49	49

207	207	return NGX_OK;
208	208	}
209	209
210		ngx_shmtx_destory(mtx);
	210	ngx_shmtx_destroy(mtx);
211	211	}
212	212
213	213	mtx->fd = ngx_open_file(name, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN,

231	231
232	232
233	233	void
234		ngx_shmtx_destory(ngx_shmtx_t *mtx)
	234	ngx_shmtx_destroy(ngx_shmtx_t *mtx)
235	235	{
236	236	if (ngx_close_file(mtx->fd) == NGX_FILE_ERROR) {
237	237	ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,

-1

src/core/ngx_shmtx.h less more

38	38
39	39	ngx_int_t ngx_shmtx_create(ngx_shmtx_t mtx, ngx_shmtx_sh_t addr,
40	40	u_char *name);
41		void ngx_shmtx_destory(ngx_shmtx_t *mtx);
	41	void ngx_shmtx_destroy(ngx_shmtx_t *mtx);
42	42	ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx);
43	43	void ngx_shmtx_lock(ngx_shmtx_t *mtx);
44	44	void ngx_shmtx_unlock(ngx_shmtx_t *mtx);