diff options
| author | Richard Levitte <levitte@openssl.org> | 1999-12-18 01:14:39 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 1999-12-18 01:14:39 +0000 |
| commit | d8df48a9bccb0f408b11af9a71abbf28a675839b (patch) | |
| tree | 333d174708315a67f10d543d789c334e19bf0588 /crypto/crypto.h | |
| parent | 78bf1920a2fb7a4d5f222ffbd16e598e3a6c54b8 (diff) | |
| download | openssl-d8df48a9bccb0f408b11af9a71abbf28a675839b.tar.gz | |
- Made sure some changed behavior is documented in CHANGES.
- Moved the handling of compile-time defaults from crypto.h to
mem_dbg.c, since it doesn't make sense for the library users to try
to affect this without recompiling libcrypto.
- Made sure V_CRYPTO_MDEBUG_TIME and V_CRYPTO_MDEBUG_THREAD had clear
and constant definitions.
- Aesthetic correction.
Diffstat (limited to 'crypto/crypto.h')
| -rw-r--r-- | crypto/crypto.h | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h index 0a76c771a7..863b4e9224 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -149,6 +149,14 @@ extern "C" { #define CRYPTO_MEM_CHECK_ENABLE 0x2 /* a bit */ #define CRYPTO_MEM_CHECK_DISABLE 0x3 /* an enume */ +/* The following are bit values to turn on or off options connected to the + * malloc checking functionality */ + +/* Adds time to the memory checking information */ +#define V_CRYPTO_MDEBUG_TIME 0x1 /* a bit */ +/* Adds thread number to the memory checking information */ +#define V_CRYPTO_MDEBUG_THREAD 0x2 /* a bit */ + /* typedef struct crypto_mem_st { @@ -196,35 +204,13 @@ typedef struct crypto_ex_data_func_st #define CRYPTO_EX_INDEX_X509_STORE 4 #define CRYPTO_EX_INDEX_X509_STORE_CTX 5 + /* This is the default callbacks, but we can have others as well */ #define CRYPTO_malloc_init() CRYPTO_set_mem_functions(\ (char *(*)())malloc,\ (char *(*)())realloc,\ (void (*)())free) - - -#ifdef CRYPTO_MDEBUG_ALL -# ifndef CRYPTO_MDEBUG_TIME -# define CRYPTO_MDEBUG_TIME -# endif -# ifndef CRYPTO_MDEBUG_THREAD -# define CRYPTO_MDEBUG_THREAD -# endif -#endif - -/* Magic to make sure we get correct values */ -#ifdef CRYPTO_MDEBUG_TIME -#define V_CRYPTO_MDEBUG_TIME 1 -#else -#define V_CRYPTO_MDEBUG_TIME 0 -#endif -#ifdef CRYPTO_MDEBUG_THREAD -#define V_CRYPTO_MDEBUG_THREAD 2 -#else -#define V_CRYPTO_MDEBUG_THREAD 0 -#endif - #define CRYPTO_malloc_debug_init() do {\ CRYPTO_set_mem_debug_functions(\ (void (*)())CRYPTO_dbg_malloc,\ @@ -232,10 +218,9 @@ typedef struct crypto_ex_data_func_st (void (*)())CRYPTO_dbg_free,\ (void (*)())CRYPTO_dbg_set_options,\ (void (*)())CRYPTO_dbg_get_options);\ - CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_TIME|V_CRYPTO_MDEBUG_THREAD);\ } while(0); -#if defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD +#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD # ifndef CRYPTO_MDEBUG /* avoid duplicate #define */ # define CRYPTO_MDEBUG # endif @@ -329,7 +314,7 @@ int CRYPTO_remove_all_info(void); */ void CRYPTO_dbg_malloc(void *addr,int num,const char *file,int line,int before_p); void CRYPTO_dbg_realloc(void *addr1,void *addr2,int num,const char *file,int line,int before_p); -void CRYPTO_dbg_free(void *,int before_p); +void CRYPTO_dbg_free(void *addr,int before_p); /* Tell the debugging code about options. By default, the following values * apply: |