aboutsummaryrefslogtreecommitdiff
path: root/src/util.cpp
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2015-06-16 04:02:25 -0400
committerLuke Dashjr <luke-jr+git@utopios.org>2015-09-22 00:43:10 +0000
commit60457d3c2f3f38d4cc3e524a5d4030bf4034b7aa (patch)
treef78d5f3a5ff4255548f103db72d242e50da8dd6b /src/util.cpp
parenta496e11d7cf827d69c309faf0da9a724d98916c5 (diff)
downloadbitcoin-60457d3c2f3f38d4cc3e524a5d4030bf4034b7aa.tar.xz
locking: fix a few small issues uncovered by -Wthread-safety
- rpcwallet: No need to lock twice here - openssl: Clang doesn't understand selective lock/unlock here. Ignore it. - CNode: Fix a legitimate (though very unlikely) locking bug.
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp
index bfb95c9044..6f95742f83 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -113,7 +113,7 @@ CTranslationInterface translationInterface;
/** Init OpenSSL library multithreading support */
static CCriticalSection** ppmutexOpenSSL;
-void locking_callback(int mode, int i, const char* file, int line)
+void locking_callback(int mode, int i, const char* file, int line) NO_THREAD_SAFETY_ANALYSIS
{
if (mode & CRYPTO_LOCK) {
ENTER_CRITICAL_SECTION(*ppmutexOpenSSL[i]);