diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
| commit | 26a3a48d65c7464b400ec1de439994d7f0d25fed (patch) | |
| tree | 91abb7d351b174e58f60e5353b731b916eaf0c5c /apps/speed.c | |
| parent | de42b6a7a82be33d2976ab605e74d7bc95b71447 (diff) | |
| download | openssl-26a3a48d65c7464b400ec1de439994d7f0d25fed.tar.gz | |
There have been a number of complaints from a number of sources that names
like Malloc, Realloc and especially Free conflict with already existing names
on some operating systems or other packages. That is reason enough to change
the names of the OpenSSL memory allocation macros to something that has a
better chance of being unique, like prepending them with OPENSSL_.
This change includes all the name changes needed throughout all C files.
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/speed.c b/apps/speed.c index f7a8e00a8b..163d5237c2 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -362,7 +362,7 @@ int MAIN(int argc, char **argv) rsa_key[i]=NULL; #endif - if ((buf=(unsigned char *)Malloc((int)BUFSIZE)) == NULL) + if ((buf=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); goto end; @@ -370,7 +370,7 @@ int MAIN(int argc, char **argv) #ifndef NO_DES buf_as_des_cblock = (des_cblock *)buf; #endif - if ((buf2=(unsigned char *)Malloc((int)BUFSIZE)) == NULL) + if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); goto end; @@ -1173,8 +1173,8 @@ int MAIN(int argc, char **argv) #endif mret=0; end: - if (buf != NULL) Free(buf); - if (buf2 != NULL) Free(buf2); + if (buf != NULL) OPENSSL_free(buf); + if (buf2 != NULL) OPENSSL_free(buf2); #ifndef NO_RSA for (i=0; i<RSA_NUM; i++) if (rsa_key[i] != NULL) |