c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warnings on mac. #263

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-05-09 00:31:25 -07:00
parent 3431a6635b
commit 0e2e1a0b05
6 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mz_strm.c
View File

@ -173,7 +173,7 @@ int32_t mz_stream_copy(void *target, void *source, int32_t len)
while (len > 0)
{
bytes_to_copy = len;
if (bytes_to_copy > sizeof(buf))
if (bytes_to_copy > (int32_t)sizeof(buf))
bytes_to_copy = sizeof(buf);
read = mz_stream_read(source, buf, bytes_to_copy);
if (read < 0)

2
mz_strm_aes.c
View File

@ -220,7 +220,7 @@ int32_t mz_stream_aes_write(void *stream, const void *buf, int32_t size)
mz_stream_aes *aes = (mz_stream_aes *)stream;
int32_t written = 0;
if (size > sizeof(aes->buffer))
if (size > (int32_t)sizeof(aes->buffer))
return MZ_STREAM_ERROR;
memcpy(aes->buffer, buf, size);

2
mz_strm_bzip.c
View File

@ -135,7 +135,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
bytes_to_read = sizeof(bzip->buffer);
if (bzip->max_total_in > 0)
{
if ((bzip->max_total_in - bzip->total_in) < sizeof(bzip->buffer))
if ((bzip->max_total_in - bzip->total_in) < (int64_t)sizeof(bzip->buffer))
bytes_to_read = (int32_t)(bzip->max_total_in - bzip->total_in);
}

23
mz_strm_crypt.c
View File

@ -40,6 +40,13 @@
/***************************************************************************/
// Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng
#if (ZLIB_VERNUM < 0x1270) || defined(ZLIBNG_VERNUM)
typedef unsigned long z_crc_t;
#endif
/***************************************************************************/
static mz_stream_vtbl mz_stream_crypt_vtbl = {
mz_stream_crypt_open,
mz_stream_crypt_is_open,
@ -65,7 +72,7 @@ typedef struct mz_stream_crypt_s {
int64_t total_in;
int64_t total_out;
uint32_t keys[3]; // keys defining the pseudo-random sequence
const uint32_t *crc_32_tab;
const z_crc_t *crc_32_tab;
uint8_t verify1;
uint8_t verify2;
const char *password;
@ -91,7 +98,7 @@ static uint8_t mz_stream_crypt_decrypt_byte(uint32_t *keys)
return (uint8_t)(((temp * (temp ^ 1)) >> 8) & 0xff);
}
static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const uint32_t *crc_32_tab, int32_t c)
static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const z_crc_t *crc_32_tab, int32_t c)
{
#define CRC32(c, b) ((*(crc_32_tab+(((uint32_t)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
@ -105,7 +112,7 @@ static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const uint32_t *crc_3
return (uint8_t)c;
}
static void mz_stream_crypt_init_keys(const char *password, uint32_t *keys, const uint32_t *crc_32_tab)
static void mz_stream_crypt_init_keys(const char *password, uint32_t *keys, const z_crc_t *crc_32_tab)
{
*(keys+0) = 305419896L;
*(keys+1) = 591751049L;
@ -199,8 +206,8 @@ int32_t mz_stream_crypt_read(void *stream, void *buf, int32_t size)
{
mz_stream_crypt *crypt = (mz_stream_crypt *)stream;
uint8_t *buf_ptr = (uint8_t *)buf;
uint32_t read = 0;
uint32_t i = 0;
int32_t read = 0;
int32_t i = 0;
read = mz_stream_read(crypt->stream.base, buf, size);
@ -215,11 +222,11 @@ int32_t mz_stream_crypt_write(void *stream, const void *buf, int32_t size)
{
mz_stream_crypt *crypt = (mz_stream_crypt *)stream;
const uint8_t *buf_ptr = (const uint8_t *)buf;
uint32_t written = 0;
uint16_t t = 0;
int32_t written = 0;
int32_t i = 0;
uint16_t t = 0;
if (size > sizeof(crypt->buffer))
if (size > (int32_t)sizeof(crypt->buffer))
return MZ_STREAM_ERROR;
for (i = 0; i < size; i++)

2
mz_strm_lzma.c
View File

@ -161,7 +161,7 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
bytes_to_read = sizeof(lzma->buffer);
if (lzma->max_total_in > 0)
{
if ((lzma->max_total_in - lzma->total_in) < sizeof(lzma->buffer))
if ((lzma->max_total_in - lzma->total_in) < (int64_t)sizeof(lzma->buffer))
bytes_to_read = (int32_t)(lzma->max_total_in - lzma->total_in);
}

2
mz_strm_zlib.c
View File

@ -139,7 +139,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
bytes_to_read = sizeof(zlib->buffer);
if (zlib->max_total_in > 0)
{
if ((zlib->max_total_in - zlib->total_in) < sizeof(zlib->buffer))
if ((zlib->max_total_in - zlib->total_in) < (int64_t)sizeof(zlib->buffer))
bytes_to_read = (int32_t)(zlib->max_total_in - zlib->total_in);
}