diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 17:19:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 02a247e0fa23f2caa9c10df3adf3476eb9813c95 (patch) | |
| tree | 27382f1da3d5bfffe5b6ac0d3bded12645a8146c /crypto/comp | |
| parent | 01d358a3ab09b0a4e79a5a492169aedcfbe8ddb3 (diff) | |
Deprecate COMP_zlib_cleanup() and make it a no-op
COMP_zlib_cleanup() should not be called expicitly - we should leave
auto-deinit to clean this up instead.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/comp')
| -rw-r--r-- | crypto/comp/c_zlib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 68b9da78be..e16fbbb4ef 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -56,7 +56,7 @@ #include <stdlib.h> #include <string.h> #include <openssl/objects.h> -#include <openssl/comp.h> +#include "internal/comp.h" #include <openssl/err.h> #include "internal/cryptlib_int.h" #include "internal/bio.h" @@ -282,7 +282,7 @@ COMP_METHOD *COMP_zlib(void) zlib_loaded++; if (!OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL)) { - COMP_zlib_cleanup(); + comp_zlib_cleanup_internal(); return meth; } if (zlib_loaded) @@ -297,7 +297,7 @@ COMP_METHOD *COMP_zlib(void) return (meth); } -void COMP_zlib_cleanup(void) +void comp_zlib_cleanup_internal(void) { #ifdef ZLIB_SHARED if (zlib_dso != NULL) |