diff options
Diffstat (limited to 'zlibWrapper')
-rw-r--r-- | zlibWrapper/examples/zwrapbench.c | 10 | ||||
-rw-r--r-- | zlibWrapper/gzcompatibility.h | 16 | ||||
-rw-r--r-- | zlibWrapper/gzlib.c | 2 | ||||
-rw-r--r-- | zlibWrapper/gzread.c | 4 | ||||
-rw-r--r-- | zlibWrapper/gzwrite.c | 4 | ||||
-rw-r--r-- | zlibWrapper/zstd_zlibwrapper.c | 10 | ||||
-rw-r--r-- | zlibWrapper/zstd_zlibwrapper.h | 18 |
7 files changed, 32 insertions, 32 deletions
diff --git a/zlibWrapper/examples/zwrapbench.c b/zlibWrapper/examples/zwrapbench.c index 1fc2117f69a7..050c9db63218 100644 --- a/zlibWrapper/examples/zwrapbench.c +++ b/zlibWrapper/examples/zwrapbench.c @@ -1,10 +1,10 @@ -/** - * Copyright (c) 2016-present, Yann Collet, Przemyslaw Skibinski, Facebook, Inc. +/* + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. * All rights reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). */ diff --git a/zlibWrapper/gzcompatibility.h b/zlibWrapper/gzcompatibility.h index e2ec1addb732..ac9020acc15b 100644 --- a/zlibWrapper/gzcompatibility.h +++ b/zlibWrapper/gzcompatibility.h @@ -1,10 +1,10 @@ -/** - * Copyright (c) 2016-present, Przemyslaw Skibinski, Facebook, Inc. +/* + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. * All rights reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). */ @@ -12,9 +12,9 @@ #if ZLIB_VERNUM <= 0x1240 ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); -ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); +ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); - + #if !defined(_WIN32) && defined(Z_LARGE64) # define z_off64_t off64_t #else @@ -38,7 +38,7 @@ struct gzFile_s { #if ZLIB_VERNUM <= 0x1270 #if defined(_WIN32) && !defined(Z_SOLO) -# include <stddef.h> /* for wchar_t */ +# include <stddef.h> /* for wchar_t */ ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, const char *mode)); #endif diff --git a/zlibWrapper/gzlib.c b/zlibWrapper/gzlib.c index aa94206a8811..8235cff4fda1 100644 --- a/zlibWrapper/gzlib.c +++ b/zlibWrapper/gzlib.c @@ -1,5 +1,5 @@ /* gzlib.c contains minimal changes required to be compiled with zlibWrapper: - * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ + * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ /* gzlib.c -- zlib functions common to reading and writing gzip files * Copyright (C) 2004-2017 Mark Adler diff --git a/zlibWrapper/gzread.c b/zlibWrapper/gzread.c index d37aaa1d4c25..88fc06c77f42 100644 --- a/zlibWrapper/gzread.c +++ b/zlibWrapper/gzread.c @@ -1,6 +1,6 @@ /* gzread.c contains minimal changes required to be compiled with zlibWrapper: - * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ - + * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ + /* gzread.c -- zlib functions for reading gzip files * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler * For conditions of distribution and use, see http://www.zlib.net/zlib_license.html diff --git a/zlibWrapper/gzwrite.c b/zlibWrapper/gzwrite.c index bcda4774aeeb..d1250b90084d 100644 --- a/zlibWrapper/gzwrite.c +++ b/zlibWrapper/gzwrite.c @@ -1,6 +1,6 @@ /* gzwrite.c contains minimal changes required to be compiled with zlibWrapper: - * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ - + * - gz_statep was converted to union to work with -Wstrict-aliasing=1 */ + /* gzwrite.c -- zlib functions for writing gzip files * Copyright (C) 2004-2017 Mark Adler * For conditions of distribution and use, see http://www.zlib.net/zlib_license.html diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c index ade3b88cd1f4..272369a2874c 100644 --- a/zlibWrapper/zstd_zlibwrapper.c +++ b/zlibWrapper/zstd_zlibwrapper.c @@ -1,10 +1,10 @@ -/** - * Copyright (c) 2016-present, Przemyslaw Skibinski, Facebook, Inc. +/* + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. * All rights reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). */ diff --git a/zlibWrapper/zstd_zlibwrapper.h b/zlibWrapper/zstd_zlibwrapper.h index 0ebd87612eea..f8f36800928e 100644 --- a/zlibWrapper/zstd_zlibwrapper.h +++ b/zlibWrapper/zstd_zlibwrapper.h @@ -1,10 +1,10 @@ -/** - * Copyright (c) 2016-present, Przemyslaw Skibinski, Facebook, Inc. +/* + * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. * All rights reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under both the BSD-style license (found in the + * LICENSE file in the root directory of this source tree) and the GPLv2 (found + * in the COPYING file in the root directory of this source tree). */ #ifndef ZSTD_ZLIBWRAPPER_H @@ -32,7 +32,7 @@ const char * zstdVersion(void); /*** COMPRESSION ***/ /* ZWRAP_useZSTDcompression() enables/disables zstd compression during runtime. By default zstd compression is disabled. To enable zstd compression please use one of the methods: - - compilation with the additional option -DZWRAP_USE_ZSTD=1 + - compilation with the additional option -DZWRAP_USE_ZSTD=1 - using '#define ZWRAP_USE_ZSTD 1' in source code before '#include "zstd_zlibwrapper.h"' - calling ZWRAP_useZSTDcompression(1) All above-mentioned methods will enable zstd compression for all threads. @@ -45,13 +45,13 @@ int ZWRAP_isUsingZSTDcompression(void); /* Changes a pledged source size for a given compression stream. It will change ZSTD compression parameters what may improve compression speed and/or ratio. The function should be called just after deflateInit() or deflateReset() and before deflate() or deflateSetDictionary(). - It's only helpful when data is compressed in blocks. - There will be no change in case of deflateInit() or deflateReset() immediately followed by deflate(strm, Z_FINISH) + It's only helpful when data is compressed in blocks. + There will be no change in case of deflateInit() or deflateReset() immediately followed by deflate(strm, Z_FINISH) as this case is automatically detected. */ int ZWRAP_setPledgedSrcSize(z_streamp strm, unsigned long long pledgedSrcSize); /* Similar to deflateReset but preserves dictionary set using deflateSetDictionary. - It should improve compression speed because there will be less calls to deflateSetDictionary + It should improve compression speed because there will be less calls to deflateSetDictionary When using zlib compression this method redirects to deflateReset. */ int ZWRAP_deflateReset_keepDict(z_streamp strm); |