You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
62 lines
2.4 KiB
62 lines
2.4 KiB
https://bugs.gentoo.org/894058
|
|
https://github.com/facebook/zstd/pull/3497
|
|
|
|
From cc94fac7c879c47984bba7d60d5ce0c9834ff4c7 Mon Sep 17 00:00:00 2001
|
|
From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
|
|
Date: Fri, 10 Feb 2023 19:30:30 -0500
|
|
Subject: [PATCH] Use correct types in LZMA comp/decomp
|
|
|
|
Bytef and uInt are zlib types, not available when zlib is disabled
|
|
|
|
Fixes: 1598e6c634ac ("Async write for decompression")
|
|
Fixes: cc0657f27d81 ("AsyncIO compression part 2 - added async read and asyncio to compression code (#3022)")
|
|
---
|
|
programs/fileio.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/programs/fileio.c b/programs/fileio.c
|
|
index 9a8300cdd8..d3ed9217d5 100644
|
|
--- a/programs/fileio.c
|
|
+++ b/programs/fileio.c
|
|
@@ -1173,8 +1173,8 @@ FIO_compressLzmaFrame(cRess_t* ress,
|
|
}
|
|
|
|
writeJob =AIO_WritePool_acquireJob(ress->writeCtx);
|
|
- strm.next_out = (Bytef*)writeJob->buffer;
|
|
- strm.avail_out = (uInt)writeJob->bufferSize;
|
|
+ strm.next_out = (BYTE*)writeJob->buffer;
|
|
+ strm.avail_out = writeJob->bufferSize;
|
|
strm.next_in = 0;
|
|
strm.avail_in = 0;
|
|
|
|
@@ -1201,7 +1201,7 @@ FIO_compressLzmaFrame(cRess_t* ress,
|
|
writeJob->usedBufferSize = compBytes;
|
|
AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
|
|
outFileSize += compBytes;
|
|
- strm.next_out = (Bytef*)writeJob->buffer;
|
|
+ strm.next_out = (BYTE*)writeJob->buffer;
|
|
strm.avail_out = writeJob->bufferSize;
|
|
} }
|
|
if (srcFileSize == UTIL_FILESIZE_UNKNOWN)
|
|
@@ -2316,8 +2316,8 @@ FIO_decompressLzmaFrame(dRess_t* ress,
|
|
}
|
|
|
|
writeJob = AIO_WritePool_acquireJob(ress->writeCtx);
|
|
- strm.next_out = (Bytef*)writeJob->buffer;
|
|
- strm.avail_out = (uInt)writeJob->bufferSize;
|
|
+ strm.next_out = (BYTE*)writeJob->buffer;
|
|
+ strm.avail_out = writeJob->bufferSize;
|
|
strm.next_in = (BYTE const*)ress->readCtx->srcBuffer;
|
|
strm.avail_in = ress->readCtx->srcBufferLoaded;
|
|
|
|
@@ -2345,7 +2345,7 @@ FIO_decompressLzmaFrame(dRess_t* ress,
|
|
writeJob->usedBufferSize = decompBytes;
|
|
AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
|
|
outFileSize += decompBytes;
|
|
- strm.next_out = (Bytef*)writeJob->buffer;
|
|
+ strm.next_out = (BYTE*)writeJob->buffer;
|
|
strm.avail_out = writeJob->bufferSize;
|
|
} }
|
|
if (ret == LZMA_STREAM_END) break;
|
|
|