nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

const-ify the new failure vars, and one old one

Browse Source
This commit is contained in:
Nick Mathewson 2015-03-13 09:41:49 -04:00
parent 833b6d30be
commit 3a68f2f54e
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/compat_pthreads.c
View File

@ -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();
}

2
src/or/control.c
View File

@ -3102,7 +3102,7 @@ handle_control_authchallenge(control_connection_t *conn, uint32_t len,
tor_free(client_nonce);
return -1;
}
int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN);
const int fail = crypto_rand(server_nonce, SAFECOOKIE_SERVER_NONCE_LEN);
tor_assert(!fail);
/* Now compute and send the server-to-controller response, and the

2
src/or/rendservice.c
View File

@ -3320,7 +3320,7 @@ rend_services_introduce(void)
intro = tor_malloc_zero(sizeof(rend_intro_point_t));
intro->extend_info = extend_info_from_node(node, 0);
intro->intro_key = crypto_pk_new();
int fail = crypto_pk_generate_key(intro->intro_key);
const int fail = crypto_pk_generate_key(intro->intro_key);
tor_assert(!fail);
intro->time_published = -1;
intro->time_to_expire = -1;