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.

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index d70c09d2b529a9c617e572368f2d1620707a08b1..34080eed9627242049f63d140ac96fb948fec27a 100644 (file)
--- 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 64661c1ebf1116aaa0a6143f8e7d7b4cc09116a5..89eea4783f006b0f699d4e0a3aafef03dec4e917 100644 (file)
--- 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)