mmo-ref/dep-minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2026-08-25 14:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added support for compiling without ZLIB_COMPAT. zlib-ng/zlib-ng#156

Browse source
This commit is contained in:
Nathan Moinvaziri 2019-01-21 14:39:19 -08:00
parent e4968653f4
commit 208a051c36
2 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
mz_crypt.c
View file

@ -15,23 +15,34 @@
#if defined(HAVE_ZLIB)
# include "zlib.h"
# if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT)
# include "zlib-ng.h"
# endif
#elif defined(HAVE_LZMA)
# include "lzma.h"
#endif
/***************************************************************************/
/* Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng */
#if defined(HAVE_ZLIB) && defined(ZLIBNG_VERNUM)
# if !defined(ZLIB_COMPAT)
# define ZLIB_PREFIX(x) zng_ ## x
# endif
typedef uint32_t z_crc_t;
#elif defined(HAVE_ZLIB)
# define ZLIB_PREFIX(x) x
# if (ZLIB_VERNUM < 0x1270)
typedef unsigned long z_crc_t;
# endif
#endif
/***************************************************************************/
uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size)
{
#if defined(HAVE_ZLIB)
/* Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng */
#ifdef ZLIBNG_VERNUM
typedef uint32_t z_crc_t;
#elif (ZLIB_VERNUM < 0x1270)
typedef unsigned long z_crc_t;
#endif
return (uint32_t)crc32((z_crc_t)value, buf, (uInt)size);
return (uint32_t)ZLIB_PREFIX(crc32)((z_crc_t)value, buf, (uInt)size);
#elif defined(HAVE_LZMA)
return (uint32_t)lzma_crc32(buf, (size_t)size, (uint32_t)value);
#else

27
mz_strm_zlib.c
View file

@ -15,10 +15,21 @@
#include "mz_strm_zlib.h"
#include "zlib.h"
#if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT)
# include "zlib-ng.h"
#endif
/***************************************************************************/
#ifndef DEF_MEM_LEVEL
#if defined(ZLIBNG_VERNUM) && !defined(ZLIB_COMPAT)
# define ZLIB_PREFIX(x) zng_ ## x
typedef zng_stream zlib_stream;
#else
# define ZLIB_PREFIX(x) x
typedef zstream zlib_stream;
#endif
#if !defined(DEF_MEM_LEVEL)
# if MAX_MEM_LEVEL >= 8
# define DEF_MEM_LEVEL 8
# else
@ -47,7 +58,7 @@ static mz_stream_vtbl mz_stream_zlib_vtbl = {
typedef struct mz_stream_zlib_s {
mz_stream stream;
z_stream zstream;
zlib_stream zstream;
uint8_t buffer[INT16_MAX];
int32_t buffer_len;
int64_t total_in;
@ -85,7 +96,7 @@ int32_t mz_stream_zlib_open(void *stream, const char *path, int32_t mode)
zlib->zstream.next_out = zlib->buffer;
zlib->zstream.avail_out = sizeof(zlib->buffer);
zlib->error = deflateInit2(&zlib->zstream, (int8_t)zlib->level, Z_DEFLATED,
zlib->error = ZLIB_PREFIX(deflateInit2)(&zlib->zstream, (int8_t)zlib->level, Z_DEFLATED,
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
#endif
}
@ -97,7 +108,7 @@ int32_t mz_stream_zlib_open(void *stream, const char *path, int32_t mode)
zlib->zstream.next_in = zlib->buffer;
zlib->zstream.avail_in = 0;
zlib->error = inflateInit2(&zlib->zstream, -MAX_WBITS);
zlib->error = ZLIB_PREFIX(inflateInit2)(&zlib->zstream, -MAX_WBITS);
#endif
}
@ -166,7 +177,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
total_in_before = zlib->zstream.avail_in;
total_out_before = zlib->zstream.total_out;
err = inflate(&zlib->zstream, Z_SYNC_FLUSH);
err = ZLIB_PREFIX(inflate)(&zlib->zstream, Z_SYNC_FLUSH);
if ((err >= Z_OK) && (zlib->zstream.msg != NULL))
{
zlib->error = Z_DATA_ERROR;
@ -238,7 +249,7 @@ static int32_t mz_stream_zlib_deflate(void *stream, int flush)
}
total_out_before = zlib->zstream.total_out;
err = deflate(&zlib->zstream, flush);
err = ZLIB_PREFIX(deflate)(&zlib->zstream, flush);
total_out_after = zlib->zstream.total_out;
out_bytes = (uint32_t)(total_out_after - total_out_before);
@ -309,7 +320,7 @@ int32_t mz_stream_zlib_close(void *stream)
mz_stream_zlib_deflate(stream, Z_FINISH);
mz_stream_zlib_flush(stream);
deflateEnd(&zlib->zstream);
ZLIB_PREFIX(deflateEnd)(&zlib->zstream);
#endif
}
else if (zlib->mode & MZ_OPEN_MODE_READ)
@ -317,7 +328,7 @@ int32_t mz_stream_zlib_close(void *stream)
#ifdef MZ_ZIP_NO_DECOMPRESSION
return MZ_SUPPORT_ERROR;
#else
inflateEnd(&zlib->zstream);
ZLIB_PREFIX(inflateEnd)(&zlib->zstream);
#endif
}