diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 10:40:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-11 10:40:54 +0200 |
| commit | b213f13a2621ec553beec06d3e2f163c1e7e2282 (patch) | |
| tree | 645bb04df0fa9c0d003420c2eb3c0957cbd34c0f /TSRM | |
| parent | d207c9a78a973d153dd17fd2d80b301d07fc9509 (diff) | |
| download | php-git-b213f13a2621ec553beec06d3e2f163c1e7e2282.tar.gz | |
Make tsrm_env_lock() void
We're not checking the return value and the NTS version of this
generates warnings. If we want to handle lock failures, we should
do a hard abort inside tsrm_env_lock() itself.
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.c | 8 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index d70c09d2b5..34080eed96 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -244,12 +244,12 @@ TSRM_API void tsrm_shutdown(void) /* {{{ */ /* environ lock api */ -TSRM_API int tsrm_env_lock() { - return tsrm_mutex_lock(tsrm_env_mutex); +TSRM_API void tsrm_env_lock() { + tsrm_mutex_lock(tsrm_env_mutex); } -TSRM_API int tsrm_env_unlock() { - return tsrm_mutex_unlock(tsrm_env_mutex); +TSRM_API void tsrm_env_unlock() { + tsrm_mutex_unlock(tsrm_env_mutex); } /* }}} */ /* enlarge the arrays for the already active threads */ diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 64661c1ebf..89eea4783f 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -98,8 +98,8 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu TSRM_API void tsrm_shutdown(void); /* environ lock API */ -TSRM_API int tsrm_env_lock(); -TSRM_API int tsrm_env_unlock(); +TSRM_API void tsrm_env_lock(); +TSRM_API void tsrm_env_unlock(); /* allocates a new thread-safe-resource id */ TSRM_API ts_rsrc_id ts_allocate_id(ts_rsrc_id *rsrc_id, size_t size, ts_allocate_ctor ctor, ts_allocate_dtor dtor); @@ -207,8 +207,8 @@ TSRM_API const char *tsrm_api_name(void); #else /* non ZTS */ -#define tsrm_env_lock() 0 -#define tsrm_env_unlock() 0 +#define tsrm_env_lock() +#define tsrm_env_unlock() #define TSRMLS_FETCH() #define TSRMLS_FETCH_FROM_CTX(ctx) |