mirror of
https://github.com/facebook/zstd.git
synced 2025-08-08 17:22:10 +03:00
[pzstd] Fixes for Windows build
* Add `Portability.h` to fix min/max issues. * Fix conversion warnings * Assert that windowLog <= 23, which is currently always the case. This could be loosened, but we aren't looking to add new functionality. Fixes on top of PR #3375 by @eli-schwartz, which added Windows CI for contrib & programs.
This commit is contained in:
committed by
Nick Terrell
parent
67cd24b25b
commit
e9797b5dc5
@@ -10,11 +10,13 @@
|
||||
#include "Pzstd.h"
|
||||
#include "SkippableFrame.h"
|
||||
#include "utils/FileSystem.h"
|
||||
#include "utils/Portability.h"
|
||||
#include "utils/Range.h"
|
||||
#include "utils/ScopeGuard.h"
|
||||
#include "utils/ThreadPool.h"
|
||||
#include "utils/WorkQueue.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <cinttypes>
|
||||
#include <cstddef>
|
||||
@@ -336,6 +338,10 @@ static size_t calculateStep(
|
||||
const ZSTD_parameters ¶ms) {
|
||||
(void)size;
|
||||
(void)numThreads;
|
||||
// Not validated to work correctly for window logs > 23.
|
||||
// It will definitely fail if windowLog + 2 is >= 4GB because
|
||||
// the skippable frame can only store sizes up to 4GB.
|
||||
assert(params.cParams.windowLog <= 23);
|
||||
return size_t{1} << (params.cParams.windowLog + 2);
|
||||
}
|
||||
|
||||
@@ -587,7 +593,8 @@ std::uint64_t writeFile(
|
||||
// start writing before compression is done because we need to know the
|
||||
// compressed size.
|
||||
// Wait for the compressed size to be available and write skippable frame
|
||||
SkippableFrame frame(out->size());
|
||||
assert(uint64_t(out->size()) < uint64_t(1) << 32);
|
||||
SkippableFrame frame(uint32_t(out->size()));
|
||||
if (!writeData(frame.data(), outputFd)) {
|
||||
errorHolder.setError("Failed to write output");
|
||||
return bytesWritten;
|
||||
|
Reference in New Issue
Block a user