diff options
| -rw-r--r-- | src/common/util.c | 10 | ||||
| -rw-r--r-- | src/or/router.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/common/util.c b/src/common/util.c index 89d200013..ce9062fd9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1741,7 +1741,7 @@ void tor_mutex_free(tor_mutex_t *m) { } struct tor_mutex_t { HANDLE handle; }; -tor_mutex_t *tor_mutex_new(void) +tor_mutex_t *tor_mutex_new(void) { tor_mutex_t *m; m = tor_malloc_zero(sizeof(tor_mutex_t)); @@ -1760,12 +1760,12 @@ void tor_mutex_acquire(tor_mutex_t *m) r = WaitForSingleObject(m->handle, INFINITE); switch (r) { case WAIT_ABANDONED: /* holding thread exited. */ - case WAIT_OBJECT_0: /* we got the mutex normally. */ + case WAIT_OBJECT_0: /* we got the mutex normally. */ break; case WAIT_TIMEOUT: /* Should never happen. */ - tor_assert(0); + tor_assert(0); break; - case WAIT_FAILED: + case WAIT_FAILED: log_fn(LOG_WARN, "Failed to acquire mutex: %d", GetLastError()); } } @@ -1774,7 +1774,7 @@ void tor_mutex_release(tor_mutex_t *m) BOOL r; r = ReleaseMutex(m->handle); if (!r) { - log_fn(LOG_WARN, "Failed to release mutex: %d", GetLastError()); + log_fn(LOG_WARN, "Failed to release mutex: %d", GetLastError()); } } diff --git a/src/or/router.c b/src/or/router.c index 9c263ecd2..d186ce5a0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -59,7 +59,7 @@ void dup_onion_keys(crypto_pk_env_t **key, crypto_pk_env_t **last) tor_mutex_acquire(key_lock); *key = crypto_pk_dup_key(onionkey); if (lastonionkey) - *last = crypto_pk_dup_key(lastonionkey); + *last = crypto_pk_dup_key(lastonionkey); else *last = NULL; tor_mutex_release(key_lock); @@ -187,7 +187,7 @@ int init_keys(void) { crypto_pk_env_t *prkey; if (!key_lock) - key_lock = tor_mutex_new(); + key_lock = tor_mutex_new(); /* OP's don't need keys. Just initialize the TLS context.*/ if (!options.ORPort) { |