facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into flexibleLevel

Browse Source
This commit is contained in:
Yann Collet 2018-02-09 09:15:05 -08:00
commit 4beaeaace5
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/Makefile
View File

@ -9,6 +9,7 @@
# This Makefile presumes libzstd is installed, using `sudo make install`
CPPFLAGS += -I../lib
LIB = ../lib/libzstd.a
.PHONY: default all clean test

10
examples/streaming_memory_usage.c
View File

@ -46,7 +46,7 @@ static unsigned readU32FromChar(const char** stringPtr)
int main(int argc, char const *argv[]) {
printf("\n Zstandard (v%u) memory usage for streaming contexts : \n\n", ZSTD_versionNumber());
printf("\n Zstandard (v%s) memory usage for streaming : \n\n", ZSTD_versionString());
unsigned wLog = 0;
if (argc > 1) {
@ -69,11 +69,13 @@ int main(int argc, char const *argv[]) {
/* forces compressor to use maximum memory size for given compression level,
* by not providing any information on input size */
ZSTD_parameters params = ZSTD_getParams(compressionLevel, 0, 0);
ZSTD_parameters params = ZSTD_getParams(compressionLevel, ZSTD_CONTENTSIZE_UNKNOWN, 0);
if (wLog) { /* special mode : specific wLog */
printf("Using custom compression parameter : level 1 + wLog=%u \n", wLog);
params = ZSTD_getParams(1, 1 << wLog, 0);
size_t const error = ZSTD_initCStream_advanced(cstream, NULL, 0, params, 0);
params = ZSTD_getParams(1 /*compressionLevel*/,
1 << wLog /*estimatedSrcSize*/,
0 /*no dictionary*/);
size_t const error = ZSTD_initCStream_advanced(cstream, NULL, 0, params, ZSTD_CONTENTSIZE_UNKNOWN);
if (ZSTD_isError(error)) {
printf("ZSTD_initCStream_advanced error : %s \n", ZSTD_getErrorName(error));
return 1;

2
lib/README.md
View File

@ -31,7 +31,7 @@ Optional advanced features are exposed via :
it unlocks access to advanced experimental API,
exposed in second part of `zstd.h`.
These APIs are not "stable", their definition may change in the future.
As a consequencem, it shall ___never be used with dynamic library___ !
As a consequence, it shall ___never be used with dynamic library___ !
Only static linking is allowed.

2
programs/zstd.1
View File

@ -1,5 +1,5 @@
.
.TH "ZSTD" "1" "2018-01-27" "zstd 1.3.3" "User Commands"
.TH "ZSTD" "1" "2018-01-27" "zstd 1.3.4" "User Commands"
.
.SH "NAME"
\fBzstd\fR \- zstd, zstdmt, unzstd, zstdcat \- Compress or decompress \.zst files