lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

imporved support for Z_FINISH

Browse Source
This commit is contained in:
inikep
2016-09-19 13:24:07 +02:00
parent 8fc5848bcb
commit e46bad0b2c
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zlibWrapper/zstd_zlibwrapper.c
View File

@ -78,7 +78,6 @@ static void ZWRAP_freeFunction(void* opaque, void* address)
typedef struct { typedef struct {
ZSTD_CStream* zbc; ZSTD_CStream* zbc;
size_t bytesLeft;
int compressionLevel; int compressionLevel;
ZSTD_customMem customMem; ZSTD_customMem customMem;
z_stream allocFunc; /* copy of zalloc, zfree, opaque */ z_stream allocFunc; /* copy of zalloc, zfree, opaque */
@ -225,21 +224,15 @@ ZEXTERN int ZEXPORT z_deflate OF((z_streamp strm, int flush))
zwc->outBuffer.dst = strm->next_out; zwc->outBuffer.dst = strm->next_out;
zwc->outBuffer.size = strm->avail_out; zwc->outBuffer.size = strm->avail_out;
zwc->outBuffer.pos = 0; zwc->outBuffer.pos = 0;
if (zwc->bytesLeft) { bytesLeft = ZSTD_endStream(zwc->zbc, &zwc->outBuffer);
bytesLeft = ZSTD_flushStream(zwc->zbc, &zwc->outBuffer); LOG_WRAPPER("ZSTD_endStream dstCapacity=%d bytesLeft=%d\n", (int)strm->avail_out, (int)bytesLeft);
LOG_WRAPPER("ZSTD_flushStream dstCapacity=%d bytesLeft=%d\n", (int)strm->avail_out, (int)bytesLeft);
} else {
bytesLeft = ZSTD_endStream(zwc->zbc, &zwc->outBuffer);
LOG_WRAPPER("ZSTD_endStream dstCapacity=%d bytesLeft=%d\n", (int)strm->avail_out, (int)bytesLeft);
}
if (ZSTD_isError(bytesLeft)) return Z_MEM_ERROR; if (ZSTD_isError(bytesLeft)) return Z_MEM_ERROR;
strm->next_out += zwc->outBuffer.pos; strm->next_out += zwc->outBuffer.pos;
strm->total_out += zwc->outBuffer.pos; strm->total_out += zwc->outBuffer.pos;
strm->avail_out -= zwc->outBuffer.pos; strm->avail_out -= zwc->outBuffer.pos;
if (flush == Z_FINISH && bytesLeft == 0) return Z_STREAM_END; if (bytesLeft == 0) return Z_STREAM_END;
zwc->bytesLeft = bytesLeft;
} }
else
if (flush == Z_SYNC_FLUSH) { if (flush == Z_SYNC_FLUSH) {
size_t bytesLeft; size_t bytesLeft;
zwc->outBuffer.dst = strm->next_out; zwc->outBuffer.dst = strm->next_out;
@ -251,7 +244,6 @@ ZEXTERN int ZEXPORT z_deflate OF((z_streamp strm, int flush))
strm->next_out += zwc->outBuffer.pos; strm->next_out += zwc->outBuffer.pos;
strm->total_out += zwc->outBuffer.pos; strm->total_out += zwc->outBuffer.pos;
strm->avail_out -= zwc->outBuffer.pos; strm->avail_out -= zwc->outBuffer.pos;
zwc->bytesLeft = bytesLeft;
} }
return Z_OK; return Z_OK;
} }