diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-01-20 23:45:19 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:50:52 +0000 |
| commit | 5ba9d5bb3b79f32506a4fba061368c18890610e4 (patch) | |
| tree | 105665d64bca04fc047ec5aa37cdb0cf188c8889 | |
| parent | 883a4d55c29cf78cc311c8b4ddfc2d7c80f11b00 (diff) | |
crypto/mem_dbg.c: make it indent-friendly.
Conflicts:
crypto/mem_dbg.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
| -rw-r--r-- | crypto/mem_dbg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index afe96ac311..d848558307 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -170,15 +170,16 @@ int CRYPTO_mem_ctrl(int mode) break; case CRYPTO_MEM_CHECK_OFF: /* aka MemCheck_stop() */ mh_mode = 0; - num_disable = 0; /* should be true *before* MemCheck_stop is used, - or there'll be a lot of confusion */ + num_disable = 0; /* should be true *before* MemCheck_stop is + used, or there'll be a lot of confusion */ break; /* switch off temporarily (for library-internal use): */ case CRYPTO_MEM_CHECK_DISABLE: /* aka MemCheck_off() */ if (mh_mode & CRYPTO_MEM_CHECK_ON) { - if (!num_disable || (disabling_thread != CRYPTO_thread_id())) /* otherwise we already have the MALLOC2 lock */ + /* otherwise we already have the MALLOC2 lock */ + if (!num_disable || (disabling_thread != CRYPTO_thread_id())) { /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if |