Fix memory leak.

[openssl.git] / crypto / comp / comp.h

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 00af0622b907adcbff80841353d7eea253c35b0e..aee8fcdef9f9740cfae2d8bbf58fa3d7405a5456 100644 (file)
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -2,21 +2,22 @@
 #ifndef HEADER_COMP_H
 #define HEADER_COMP_H
 
+#include <openssl/crypto.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include "crypto.h"
-
 typedef struct comp_method_st
        {
        int type;               /* NID for compression library */
-       char *name;             /* A text string to identify the library */
+       const char *name;       /* A text string to identify the library */
        int (*init)();
        void (*finish)();
        int (*compress)();
        int (*expand)();
        long (*ctrl)();
+       long (*callback_ctrl)();
        } COMP_METHOD;
 
 typedef struct comp_ctx_st
@@ -30,7 +31,6 @@ typedef struct comp_ctx_st
        CRYPTO_EX_DATA  ex_data;
        } COMP_CTX;
 
-#ifndef NOPROTO
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
 void COMP_CTX_free(COMP_CTX *ctx);
@@ -39,24 +39,19 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
        unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
-#ifdef ZLIB
 COMP_METHOD *COMP_zlib(void );
-#endif
 
-#else
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
 
-COMP_CTX *COMP_CTX_new();
-void COMP_CTX_free();
-int COMP_compress_block();
-int COMP_expand_block();
-COMP_METHOD *COMP_rle();
-#ifdef ZLIB
-COMP_METHOD *COMP_zlib();
-#endif
+/* Error codes for the COMP functions. */
+
+/* Function codes. */
+
+/* Reason codes. */
 
-#endif
-/* BEGIN ERROR CODES */
- 
 #ifdef  __cplusplus
 }
 #endif