signed vs. unsigned clash.

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

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 811cb5833d3b518198c9df1339c15d78e6d55d5d..5d59354a5715f9db49dcf258a59c39bd011b4456 100644 (file)
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -2,25 +2,32 @@
 #ifndef HEADER_COMP_H
 #define HEADER_COMP_H
 
+#include <openssl/crypto.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <openssl/crypto.h>
+typedef struct comp_ctx_st COMP_CTX;
 
 typedef struct comp_method_st
        {
        int type;               /* NID for compression library */
        const char *name;       /* A text string to identify the library */
-       int (*init)();
-       void (*finish)();
-       int (*compress)();
-       int (*expand)();
-       long (*ctrl)();
-       long (*callback_ctrl)();
+       int (*init)(COMP_CTX *ctx);
+       void (*finish)(COMP_CTX *ctx);
+       int (*compress)(COMP_CTX *ctx,
+                       unsigned char *out, unsigned int olen,
+                       unsigned char *in, unsigned int ilen);
+       int (*expand)(COMP_CTX *ctx,
+                     unsigned char *out, unsigned int olen,
+                     unsigned char *in, unsigned int ilen);
+       /* The following two do NOTHING, but are kept for backward compatibility */
+       long (*ctrl)(void);
+       long (*callback_ctrl)(void);
        } COMP_METHOD;
 
-typedef struct comp_ctx_st
+struct comp_ctx_st
        {
        COMP_METHOD *meth;
        unsigned long compress_in;
@@ -29,7 +36,7 @@ typedef struct comp_ctx_st
        unsigned long expand_out;
 
        CRYPTO_EX_DATA  ex_data;
-       } COMP_CTX;
+       };
 
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
@@ -39,14 +46,13 @@ 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
 
 /* 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.
  */
+void ERR_load_COMP_strings(void);
 
 /* Error codes for the COMP functions. */
 
@@ -58,4 +64,3 @@ COMP_METHOD *COMP_zlib(void );
 }
 #endif
 #endif
-