]> granicus.if.org Git - openssl/commitdiff
crypto/mem_dbg.c: make it indent-friendly.
authorAndy Polyakov <appro@openssl.org>
Tue, 20 Jan 2015 22:45:19 +0000 (23:45 +0100)
committerMatt Caswell <matt@openssl.org>
Thu, 22 Jan 2015 09:20:07 +0000 (09:20 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
crypto/mem_dbg.c

index bbfee1adf039ac6072f1972d4c473fad6191205f..b0f2edc2f064eda41b3b34312138f01781f68c4b 100644 (file)
@@ -229,8 +229,8 @@ 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): */
@@ -239,7 +239,8 @@ int CRYPTO_mem_ctrl(int mode)
                        {
                        CRYPTO_THREADID 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
                                 * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if