diff options
| author | Erik Rigtorp <erik@rigtorp.se> | 2021-09-01 23:16:59 +0200 |
|---|---|---|
| committer | Erik Rigtorp <erik@rigtorp.se> | 2021-09-01 23:16:59 +0200 |
| commit | 341a9d099ca4b9ee226516726983083238930947 (patch) | |
| tree | 3e512c2556007e4715bf53ad3ac5b425c3c47845 /wiretap | |
| parent | 5844c469f0486bd1e360282dc292e85b8aa9bbec (diff) | |
Fix build for debian and macOS
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_wrappers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c index 8bf8062bb3..7462a97be7 100644 --- a/wiretap/file_wrappers.c +++ b/wiretap/file_wrappers.c @@ -835,7 +835,7 @@ gz_head(FILE_T state) && state->in.buf[0] == 0x28 && state->in.buf[1] == 0xb5 && state->in.buf[2] == 0x2f && state->in.buf[3] == 0xfd) { #ifdef HAVE_ZSTD - const size_t ret = ZSTD_DCtx_reset(state->zstd_dctx, ZSTD_reset_session_and_parameters); + const size_t ret = ZSTD_initDStream(state->zstd_dctx); if (ZSTD_isError(ret)) { state->err = WTAP_ERR_DECOMPRESS; state->err_info = ZSTD_getErrorName(ret); @@ -927,7 +927,7 @@ fill_out_buffer(FILE_T state) state->in.avail -= input.pos; state->out.next = output.dst; - state->out.avail = output.pos; + state->out.avail = (guint)output.pos; if (ret == 0) { state->compression = UNKNOWN; @@ -954,7 +954,7 @@ fill_out_buffer(FILE_T state) state->in.avail -= inBufSize; state->out.next = state->out.buf; - state->out.avail = outBufSize; + state->out.avail = (guint)outBufSize; if (ret == 0) { state->compression = UNKNOWN; @@ -1083,8 +1083,8 @@ file_fdopen(int fd) #endif #ifdef HAVE_ZSTD /* we should have separate input and output buf sizes */ - want = MAX(want, ZSTD_DStreamInSize()); - want = MAX(want, ZSTD_DStreamOutSize()); + want = MAX(want, (guint)ZSTD_DStreamInSize()); + want = MAX(want, (guint)ZSTD_DStreamOutSize()); #endif /* allocate buffers */ |