New function X509_signature_print() to remove some duplicate

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 5890e5577406c0bf276e13bf16ad9f4c12c29f17..4e4b894ab7f46e75153bfdd4441d44bf23a1b35f 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -181,8 +181,8 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line)
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_locked_func(num);
-#ifdef LEVITTE_DEBUG
-       fprintf(stderr, "LEVITTE_DEBUG:         > 0x%p (%d)\n", ret, num);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         > 0x%p (%d)\n", ret, num);
 #endif
        if (malloc_debug_func != NULL)
                malloc_debug_func(ret, num, file, line, 1);
@@ -194,8 +194,8 @@ void CRYPTO_free_locked(void *str)
        {
        if (free_debug_func != NULL)
                free_debug_func(str, 0);
-#ifdef LEVITTE_DEBUG
-       fprintf(stderr, "LEVITTE_DEBUG:         < 0x%p\n", str);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         < 0x%p\n", str);
 #endif
        free_locked_func(str);
        if (free_debug_func != NULL)
@@ -213,8 +213,8 @@ void *CRYPTO_malloc(int num, const char *file, int line)
                malloc_debug_func(NULL, num, file, line, 0);
                }
        ret = malloc_func(num);
-#ifdef LEVITTE_DEBUG
-       fprintf(stderr, "LEVITTE_DEBUG:         > 0x%p (%d)\n", ret, num);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         > 0x%p (%d)\n", ret, num);
 #endif
        if (malloc_debug_func != NULL)
                malloc_debug_func(ret, num, file, line, 1);
@@ -229,8 +229,8 @@ void *CRYPTO_realloc(void *str, int num, const char *file, int line)
        if (realloc_debug_func != NULL)
                realloc_debug_func(str, NULL, num, file, line, 0);
        ret = realloc_func(str,num);
-#ifdef LEVITTE_DEBUG
-       fprintf(stderr, "LEVITTE_DEBUG:         | 0x%p -> 0x%p (%d)\n", str, ret, num);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         | 0x%p -> 0x%p (%d)\n", str, ret, num);
 #endif
        if (realloc_debug_func != NULL)
                realloc_debug_func(str, ret, num, file, line, 1);
@@ -242,8 +242,8 @@ void CRYPTO_free(void *str)
        {
        if (free_debug_func != NULL)
                free_debug_func(str, 0);
-#ifdef LEVITTE_DEBUG
-       fprintf(stderr, "LEVITTE_DEBUG:         < 0x%p\n", str);
+#ifdef LEVITTE_DEBUG_MEM
+       fprintf(stderr, "LEVITTE_DEBUG_MEM:         < 0x%p\n", str);
 #endif
        free_func(str);
        if (free_debug_func != NULL)
@@ -252,8 +252,8 @@ void CRYPTO_free(void *str)
 
 void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
        {
-       if (a != NULL) Free(a);
-       a=(char *)Malloc(num);
+       if (a != NULL) OPENSSL_free(a);
+       a=(char *)OPENSSL_malloc(num);
        return(a);
        }