aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2015-12-16 23:02:47 -0500
committerRich Salz <rsalz@openssl.org>2015-12-22 09:11:07 -0500
commit4fae386cb0563a0c05c2817a5ccb3c18e6d62d8d (patch)
treebe4d48641c4e87ab56a24df3e4c4f937c9bb2c34 /include
parentc99de0533debc8a6ed08b47b414bdea19457eafd (diff)
downloadopenssl-4fae386cb0563a0c05c2817a5ccb3c18e6d62d8d.tar.gz
Cleanup CRYPTO_{push,pop}_info
Rename to OPENSSL_mem_debug_{push,pop}. Remove simple calls; keep only calls used in recursive functions. Ensure we always push, to simplify so that we can always pop Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/crypto.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 70feb7fa71..e71214e955 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -507,11 +507,12 @@ void OPENSSL_cleanse(void *ptr, size_t len);
void CRYPTO_set_mem_debug_options(long bits);
long CRYPTO_get_mem_debug_options(void);
-# define CRYPTO_push_info(info) \
- CRYPTO_push_info_(info, __FILE__, __LINE__);
-int CRYPTO_push_info_(const char *info, const char *file, int line);
-int CRYPTO_pop_info(void);
-int CRYPTO_remove_all_info(void);
+# define OPENSSL_mem_debug_push(info) \
+ CRYPTO_mem_debug_push(info, __FILE__, __LINE__)
+# define OPENSSL_mem_debug_pop() \
+ CRYPTO_mem_debug_pop()
+int CRYPTO_mem_debug_push(const char *info, const char *file, int line);
+int CRYPTO_mem_debug_pop(void);
/*
* Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;