Skip to content

Commit cc94fac

Browse files
committed
Use correct types in LZMA comp/decomp
Bytef and uInt are zlib types, not available when zlib is disabled Fixes: 1598e6c ("Async write for decompression") Fixes: cc0657f ("AsyncIO compression part 2 - added async read and asyncio to compression code (facebook#3022)")
1 parent 515266e commit cc94fac

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

programs/fileio.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,8 +1173,8 @@ FIO_compressLzmaFrame(cRess_t* ress,
11731173
}
11741174

11751175
writeJob =AIO_WritePool_acquireJob(ress->writeCtx);
1176-
strm.next_out = (Bytef*)writeJob->buffer;
1177-
strm.avail_out = (uInt)writeJob->bufferSize;
1176+
strm.next_out = (BYTE*)writeJob->buffer;
1177+
strm.avail_out = writeJob->bufferSize;
11781178
strm.next_in = 0;
11791179
strm.avail_in = 0;
11801180

@@ -1201,7 +1201,7 @@ FIO_compressLzmaFrame(cRess_t* ress,
12011201
writeJob->usedBufferSize = compBytes;
12021202
AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
12031203
outFileSize += compBytes;
1204-
strm.next_out = (Bytef*)writeJob->buffer;
1204+
strm.next_out = (BYTE*)writeJob->buffer;
12051205
strm.avail_out = writeJob->bufferSize;
12061206
} }
12071207
if (srcFileSize == UTIL_FILESIZE_UNKNOWN)
@@ -2316,8 +2316,8 @@ FIO_decompressLzmaFrame(dRess_t* ress,
23162316
}
23172317

23182318
writeJob = AIO_WritePool_acquireJob(ress->writeCtx);
2319-
strm.next_out = (Bytef*)writeJob->buffer;
2320-
strm.avail_out = (uInt)writeJob->bufferSize;
2319+
strm.next_out = (BYTE*)writeJob->buffer;
2320+
strm.avail_out = writeJob->bufferSize;
23212321
strm.next_in = (BYTE const*)ress->readCtx->srcBuffer;
23222322
strm.avail_in = ress->readCtx->srcBufferLoaded;
23232323

@@ -2345,7 +2345,7 @@ FIO_decompressLzmaFrame(dRess_t* ress,
23452345
writeJob->usedBufferSize = decompBytes;
23462346
AIO_WritePool_enqueueAndReacquireWriteJob(&writeJob);
23472347
outFileSize += decompBytes;
2348-
strm.next_out = (Bytef*)writeJob->buffer;
2348+
strm.next_out = (BYTE*)writeJob->buffer;
23492349
strm.avail_out = writeJob->bufferSize;
23502350
} }
23512351
if (ret == LZMA_STREAM_END) break;

0 commit comments

Comments
 (0)