torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unbork windows whitespace

Browse Source 
svn:r1949
This commit is contained in:
Nick Mathewson
2004-06-05 01:56:54 +00:00
parent f08ea70480
commit 15be9c2b71
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/common/util.c
+5 -5
View File
@@ -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());
}
}
trunk/src/or/router.c
+2 -2
View File
@@ -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) {