StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

ZStandard: use seprate structure for (de)compression

Browse Source
This commit is contained in:
Mariusz Zaborski 2022-02-02 12:34:05 -05:00
parent 9ee3a26e8b
commit 05102f2c41
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/zstd/CMakeLists.txt
View File

@ -51,6 +51,9 @@ add_sapi_library(
ZSTD_createDCtx ZSTD_createDCtx
ZSTD_freeDCtx ZSTD_freeDCtx
ZSTD_createCCtx
ZSTD_freeCCtx
ZSTD_CCtx_setParameter ZSTD_CCtx_setParameter
ZSTD_compressBound ZSTD_compressBound

12
contrib/zstd/utils/utils_zstd.cc
View File

@ -110,16 +110,16 @@ absl::Status CompressStream(ZstdApi& api, std::ifstream& in_file,
} }
// Create Zstd context. // Create Zstd context.
SAPI_ASSIGN_OR_RETURN(ZSTD_DCtx * dctx, api.ZSTD_createDCtx()); SAPI_ASSIGN_OR_RETURN(ZSTD_CCtx * cctx, api.ZSTD_createCCtx());
sapi::v::RemotePtr rdctx(dctx); sapi::v::RemotePtr rcctx(cctx);
SAPI_ASSIGN_OR_RETURN(iserr, api.ZSTD_CCtx_setParameter( SAPI_ASSIGN_OR_RETURN(iserr, api.ZSTD_CCtx_setParameter(
&rdctx, ZSTD_c_compressionLevel, level)); &rcctx, ZSTD_c_compressionLevel, level));
if (!iserr) { if (!iserr) {
return absl::UnavailableError("Unable to set parameter"); return absl::UnavailableError("Unable to set parameter");
} }
SAPI_ASSIGN_OR_RETURN( SAPI_ASSIGN_OR_RETURN(
iserr, api.ZSTD_CCtx_setParameter(&rdctx, ZSTD_c_checksumFlag, 1)); iserr, api.ZSTD_CCtx_setParameter(&rcctx, ZSTD_c_checksumFlag, 1));
if (!iserr) { if (!iserr) {
return absl::UnavailableError("Unable to set parameter"); return absl::UnavailableError("Unable to set parameter");
} }
@ -151,7 +151,7 @@ absl::Status CompressStream(ZstdApi& api, std::ifstream& in_file,
struct_out.mutable_data()->size = outbuf.GetSize(); struct_out.mutable_data()->size = outbuf.GetSize();
SAPI_ASSIGN_OR_RETURN(size_t remaining, api.ZSTD_compressStream2( SAPI_ASSIGN_OR_RETURN(size_t remaining, api.ZSTD_compressStream2(
&rdctx, struct_out.PtrBoth(), &rcctx, struct_out.PtrBoth(),
struct_in.PtrBoth(), mode)); struct_in.PtrBoth(), mode));
SAPI_ASSIGN_OR_RETURN(int iserr, api.ZSTD_isError(remaining)) SAPI_ASSIGN_OR_RETURN(int iserr, api.ZSTD_isError(remaining))
if (iserr) { if (iserr) {
@ -175,7 +175,7 @@ absl::Status CompressStream(ZstdApi& api, std::ifstream& in_file,
} }
} }
api.ZSTD_freeDCtx(&rdctx).IgnoreError(); api.ZSTD_freeDCtx(&rcctx).IgnoreError();
return absl::OkStatus(); return absl::OkStatus();
} }