ec/ecp_nistz256.c: further harmonization with latest rules.

[openssl.git] / crypto / mem_dbg.c

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index ac793397f10f5289fe0d1a5ac1cc8ad3e33f4b28..b0f2edc2f064eda41b3b34312138f01781f68c4b 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -142,7 +142,8 @@ static LHASH_OF(MEM) *mh=NULL; /* hash-table of memory requests
 
 
 typedef struct app_mem_info_st
-/* For application-defined information (static C-string `info')
+/*-
+ * For application-defined information (static C-string `info')
  * to be displayed in memory leak list.
  * Each thread has its own stack.  For applications, there is
  *   CRYPTO_push_info("...")     to push an entry,
@@ -228,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): */
@@ -238,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
@@ -822,7 +824,7 @@ void CRYPTO_mem_leaks(BIO *b)
        MemCheck_on(); /* release MALLOC2 lock */
        }
 
-#ifndef OPENSSL_NO_FP_API
+#ifndef OPENSSL_NO_STDIO
 void CRYPTO_mem_leaks_fp(FILE *fp)
        {
        BIO *b;