generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/mem_dbg.c: make it indent-friendly.

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2015-01-20 23:45:19 +01:00 committed by Matt Caswell
parent a7b1eed566
commit 061b67f6f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/mem_dbg.c
View File

@ -229,8 +229,8 @@ int CRYPTO_mem_ctrl(int mode)
break; break;
case CRYPTO_MEM_CHECK_OFF: /* aka MemCheck_stop() */ case CRYPTO_MEM_CHECK_OFF: /* aka MemCheck_stop() */
mh_mode = 0; mh_mode = 0;
num_disable = 0; /* should be true *before* MemCheck_stop is used, num_disable = 0; /* should be true *before* MemCheck_stop is
or there'll be a lot of confusion */ used, or there'll be a lot of confusion */
break; break;
/* switch off temporarily (for library-internal use): */ /* switch off temporarily (for library-internal use): */
@ -239,7 +239,8 @@ int CRYPTO_mem_ctrl(int mode)
{ {
CRYPTO_THREADID cur; CRYPTO_THREADID cur;
CRYPTO_THREADID_current(&cur); CRYPTO_THREADID_current(&cur);
if (!num_disable || CRYPTO_THREADID_cmp(&disabling_threadid, &cur)) /* otherwise we already have the MALLOC2 lock */ /* see if we don't have the MALLOC2 lock already */
if (!num_disable || CRYPTO_THREADID_cmp(&disabling_threadid, &cur))
{ {
/* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while
* we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if