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 /demos | |
| 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 'demos')
| -rw-r--r-- | demos/b64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/b64.c b/demos/b64.c index ad86bc9b49..8e248e7e72 100644 --- a/demos/b64.c +++ b/demos/b64.c @@ -177,11 +177,11 @@ bad: if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize); } - strbuf=Malloc(SIZE); - buff=(unsigned char *)Malloc(EVP_ENCODE_LENGTH(bsize)); + strbuf=OPENSSL_malloc(SIZE); + buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize)); if ((buff == NULL) || (strbuf == NULL)) { - BIO_printf(bio_err,"Malloc failure\n"); + BIO_printf(bio_err,"OPENSSL_malloc failure\n"); goto end; } @@ -259,8 +259,8 @@ bad: BIO_printf(bio_err,"bytes written:%8ld\n",BIO_number_written(out)); } end: - if (strbuf != NULL) Free(strbuf); - if (buff != NULL) Free(buff); + if (strbuf != NULL) OPENSSL_free(strbuf); + if (buff != NULL) OPENSSL_free(buff); if (in != NULL) BIO_free(in); if (out != NULL) BIO_free(out); if (benc != NULL) BIO_free(benc); |