X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fcomp%2Fc_zlib.c;h=6684ab4841f0ae039f4def7b9df7d0c443c6b476;hb=a3fe382e2d2d794c598921cd39117581a2a8941b;hp=35ab0c63dc73fe35446a063c22186b0210c3c7dd;hpb=31b8d8684441e6cd5138832bb1b2ddb10acd6ba6;p=oweals%2Fopenssl.git

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 35ab0c63dc..6684ab4841 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -1,8 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 COMP_METHOD *COMP_zlib(void );
 
@@ -40,12 +40,8 @@ static COMP_METHOD zlib_method={
 	NULL,
 	};
 
-static int zlib_compress_block(ctx,out,olen,in,ilen)
-COMP_CTX *ctx;
-unsigned char *out;
-unsigned int olen;
-unsigned char *in;
-unsigned int ilen;
+static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out,
+	     unsigned int olen, unsigned char *in, unsigned int ilen)
 	{
 	unsigned long l;
 	int i;
@@ -74,12 +70,8 @@ fprintf(stderr,"compress(%4d)->%4d %s\n",ilen,(int)l,(clear)?"clear":"zlib");
 	return((int)l);
 	}
 
-static int zlib_expand_block(ctx,out,olen,in,ilen)
-COMP_CTX *ctx;
-unsigned char *out;
-unsigned int olen;
-unsigned char *in;
-unsigned int ilen;
+static int zlib_expand_block(COMP_CTX *ctx, unsigned char *out,
+	     unsigned int olen, unsigned char *in, unsigned int ilen)
 	{
 	unsigned long l;
 	int i;
@@ -100,11 +92,8 @@ unsigned int ilen;
 	return((int)l);
 	}
 
-static int zz_uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
+static int zz_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source,
+	     uLong sourceLen)
 {
     z_stream stream;
     int err;
@@ -137,7 +126,7 @@ static int zz_uncompress (dest, destLen, source, sourceLen)
 
 #endif
 
-COMP_METHOD *COMP_zlib()
+COMP_METHOD *COMP_zlib(void)
 	{
 	return(&zlib_method);
 	}