generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename

Browse Source 
CRYPTO_add_info    => CRYPTO_push_info
   CRYPTO_remove_info => CRYPTO_pop_info
in the hope that these names are more descriptive;
and "make update".
This commit is contained in:
Bodo Möller 1999-12-18 13:51:47 +00:00
parent 75acc288ca
commit 2b6313d0da
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openssl.c
View File

@ -237,8 +237,9 @@ end:
ERR_free_strings(); ERR_free_strings();
#ifdef LEVITTE_DEBUG #ifdef LEVITTE_DEBUG
CRYPTO_add_info("Just to make sure I get a memory leak I can see :-)"); CRYPTO_push_info("Just to make sure I get a memory leak I can see :-)");
(void)Malloc(1024); (void)Malloc(1024);
CRYPTO_pop_info();
#endif #endif
CRYPTO_mem_leaks(bio_err); CRYPTO_mem_leaks(bio_err);

8
crypto/crypto.h
View File

@ -302,10 +302,10 @@ void *CRYPTO_remalloc(void *addr,int num, char *file, int line);
void CRYPTO_set_mem_debug_options(long bits); void CRYPTO_set_mem_debug_options(long bits);
long CRYPTO_get_mem_debug_options(); long CRYPTO_get_mem_debug_options();
#define CRYPTO_add_info(info) \ #define CRYPTO_push_info(info) \
CRYPTO_add_info_(info, __FILE__, __LINE__); CRYPTO_push_info_(info, __FILE__, __LINE__);
int CRYPTO_add_info_(const char *info, const char *file, int line); int CRYPTO_push_info_(const char *info, const char *file, int line);
int CRYPTO_remove_info(void); int CRYPTO_pop_info(void);
int CRYPTO_remove_all_info(void); int CRYPTO_remove_all_info(void);
/* The last argument has the following significance: /* The last argument has the following significance:

20
crypto/mem_dbg.c
View File

@ -88,9 +88,9 @@ 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. * to be displayed in memory leak list.
* Each thread has its own stack. For applications, there is * Each thread has its own stack. For applications, there is
* CRYPTO_add_info("...") to push an entry, * CRYPTO_push_info("...") to push an entry,
* CRYPTO_remove_info() to pop an entry, * CRYPTO_pop_info() to pop an entry,
* CRYPTO_remove_all_info() to pop all entries. * CRYPTO_remove_all_info() to pop all entries.
*/ */
{ {
unsigned long thread; unsigned long thread;
@ -249,7 +249,7 @@ static unsigned long app_info_hash(APP_INFO *a)
return(ret); return(ret);
} }
static APP_INFO *remove_info() static APP_INFO *pop_info()
{ {
APP_INFO tmp; APP_INFO tmp;
APP_INFO *ret = NULL; APP_INFO *ret = NULL;
@ -269,7 +269,7 @@ static APP_INFO *remove_info()
#ifdef LEVITTE_DEBUG #ifdef LEVITTE_DEBUG
if (ret->thread != tmp.thread) if (ret->thread != tmp.thread)
{ {
fprintf(stderr, "remove_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n", fprintf(stderr, "pop_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
ret->thread, tmp.thread); ret->thread, tmp.thread);
abort(); abort();
} }
@ -286,7 +286,7 @@ static APP_INFO *remove_info()
return(ret); return(ret);
} }
int CRYPTO_add_info_(const char *info, const char *file, int line) int CRYPTO_push_info_(const char *info, const char *file, int line)
{ {
APP_INFO *ami, *amim; APP_INFO *ami, *amim;
int ret=0; int ret=0;
@ -322,7 +322,7 @@ int CRYPTO_add_info_(const char *info, const char *file, int line)
#ifdef LEVITTE_DEBUG #ifdef LEVITTE_DEBUG
if (ami->thread != amim->thread) if (ami->thread != amim->thread)
{ {
fprintf(stderr, "CRYPTO_add_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n", fprintf(stderr, "CRYPTO_push_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
amim->thread, ami->thread); amim->thread, ami->thread);
abort(); abort();
} }
@ -336,7 +336,7 @@ int CRYPTO_add_info_(const char *info, const char *file, int line)
return(ret); return(ret);
} }
int CRYPTO_remove_info(void) int CRYPTO_pop_info(void)
{ {
int ret=0; int ret=0;
@ -344,7 +344,7 @@ int CRYPTO_remove_info(void)
{ {
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
ret=(remove_info() != NULL); ret=(pop_info() != NULL);
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
} }
@ -359,7 +359,7 @@ int CRYPTO_remove_all_info(void)
{ {
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
while(remove_info() != NULL) while(pop_info() != NULL)
ret++; ret++;
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

8
util/libeay.num
View File

@ -2129,3 +2129,11 @@ PKCS7_simple_smimecap 2153
PKCS7_get_smimecap 2154 PKCS7_get_smimecap 2154
PKCS7_sign 2155 PKCS7_sign 2155
PKCS7_add_attrib_smimecap 2156 PKCS7_add_attrib_smimecap 2156
CRYPTO_dbg_set_options 2157
CRYPTO_remove_all_info 2158
CRYPTO_get_mem_debug_functions 2159
CRYPTO_is_mem_check_on 2160
CRYPTO_set_mem_debug_functions 2161
CRYPTO_pop_info 2162
CRYPTO_push_info_ 2163
CRYPTO_set_mem_debug_options 2164