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:50:52 +0000 (09:50 +0000)
Conflicts:
crypto/mem_dbg.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
crypto/mem_dbg.c

index afe96ac311652daffd82378dc628a0deb970638c..d848558307e2e30414b267c96a25f95c66dc0dca 100644 (file)
@@ -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