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

Code cleanup.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-11-22 09:02:10 -08:00
parent cdac37e1fe
commit 1b6fcaca41
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mz_strm_bzip.c
View File

@ -123,7 +123,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
int32_t total_out = 0;
int32_t in_bytes = 0;
int32_t out_bytes = 0;
int32_t bytes_to_read = 0;
int32_t bytes_to_read = sizeof(bzip->buffer);
int32_t read = 0;
int32_t err = BZ_OK;
@ -138,10 +138,9 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
{
if (bzip->bzstream.avail_in == 0)
{
bytes_to_read = sizeof(bzip->buffer);
if (bzip->max_total_in > 0)
{
if ((bzip->max_total_in - bzip->total_in) < (int64_t)sizeof(bzip->buffer))
if ((int64_t)bytes_to_read > (bzip->max_total_in - bzip->total_in))
bytes_to_read = (int32_t)(bzip->max_total_in - bzip->total_in);
}
@ -149,7 +148,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
if (read < 0)
return read;
if (read == 0 && out_bytes == 0)
if (read == 0)
break;
bzip->bzstream.next_in = (char *)bzip->buffer;

5
mz_strm_libcomp.c
View File

@ -119,7 +119,7 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
int32_t total_out = 0;
int32_t in_bytes = 0;
int32_t out_bytes = 0;
int32_t bytes_to_read = 0;
int32_t bytes_to_read = sizeof(libcomp->buffer);
int32_t read = 0;
int32_t err = MZ_OK;
int16_t flags = 0;
@ -131,10 +131,9 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
{
if (libcomp->cstream.src_size == 0)
{
bytes_to_read = sizeof(libcomp->buffer);
if (libcomp->max_total_in > 0)
{
if ((libcomp->max_total_in - libcomp->total_in) < (int64_t)sizeof(libcomp->buffer))
if ((int64_t)bytes_to_read > (libcomp->max_total_in - libcomp->total_in))
bytes_to_read = (int32_t)(libcomp->max_total_in - libcomp->total_in);
}

4
mz_strm_lzma.c
View File

@ -167,7 +167,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) < (int64_t)sizeof(lzma->buffer))
if ((int64_t)bytes_to_read > (lzma->max_total_in - lzma->total_in))
bytes_to_read = (int32_t)(lzma->max_total_in - lzma->total_in);
}
@ -175,7 +175,7 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
if (read < 0)
return read;
if (read == 0 && out_bytes == 0)
if (read == 0)
break;
lzma->lstream.next_in = lzma->buffer;

7
mz_strm_zlib.c
View File

@ -131,7 +131,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
uint32_t total_out = 0;
uint32_t in_bytes = 0;
uint32_t out_bytes = 0;
int32_t bytes_to_read = 0;
int32_t bytes_to_read = sizeof(zlib->buffer);
int32_t read = 0;
int32_t err = Z_OK;
@ -143,10 +143,9 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
{
if (zlib->zstream.avail_in == 0)
{
bytes_to_read = sizeof(zlib->buffer);
if (zlib->max_total_in > 0)
{
if ((zlib->max_total_in - zlib->total_in) < (int64_t)sizeof(zlib->buffer))
if ((int64_t)bytes_to_read > (zlib->max_total_in - zlib->total_in))
bytes_to_read = (int32_t)(zlib->max_total_in - zlib->total_in);
}
@ -154,7 +153,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
if (read < 0)
return read;
if (read == 0 && out_bytes == 0)
if (read == 0)
break;
zlib->zstream.next_in = zlib->buffer;