|
@@ -91,10 +91,9 @@ static pthread_mutexattr_t attr_recursive;
|
|
|
void
|
|
|
tor_mutex_init(tor_mutex_t *mutex)
|
|
|
{
|
|
|
- int err;
|
|
|
if (PREDICT_UNLIKELY(!threads_initialized))
|
|
|
tor_threads_init();
|
|
|
- err = pthread_mutex_init(&mutex->mutex, &attr_recursive);
|
|
|
+ const int err = pthread_mutex_init(&mutex->mutex, &attr_recursive);
|
|
|
if (PREDICT_UNLIKELY(err)) {
|
|
|
log_err(LD_GENERAL, "Error %d creating a mutex.", err);
|
|
|
tor_fragile_assert();
|
|
@@ -276,16 +275,16 @@ void
|
|
|
tor_threads_init(void)
|
|
|
{
|
|
|
if (!threads_initialized) {
|
|
|
- int ret;
|
|
|
pthread_mutexattr_init(&attr_recursive);
|
|
|
pthread_mutexattr_settype(&attr_recursive, PTHREAD_MUTEX_RECURSIVE);
|
|
|
- ret = pthread_attr_init(&attr_detached);
|
|
|
- tor_assert(ret == 0);
|
|
|
+ const int ret1 = pthread_attr_init(&attr_detached);
|
|
|
+ tor_assert(ret1 == 0);
|
|
|
#ifndef PTHREAD_CREATE_DETACHED
|
|
|
#define PTHREAD_CREATE_DETACHED 1
|
|
|
#endif
|
|
|
- ret = pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
|
|
|
- tor_assert(ret == 0);
|
|
|
+ const int ret2 =
|
|
|
+ pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED);
|
|
|
+ tor_assert(ret2 == 0);
|
|
|
threads_initialized = 1;
|
|
|
set_main_thread();
|
|
|
}
|