From 5ba9d5bb3b79f32506a4fba061368c18890610e4 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 20 Jan 2015 23:45:19 +0100 Subject: [PATCH] crypto/mem_dbg.c: make it indent-friendly. Conflicts: crypto/mem_dbg.c Reviewed-by: Tim Hudson --- crypto/mem_dbg.c | 7 ++++--- 1 file 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 -- 2.39.2