last batch of header files changed to reflect new license (#825)

only remains to update contrib/linux-kernel (@terrelln)

build/cmake/lib/CMakeLists.txt

@@ -1,13 +1,10 @@
 # ################################################################
-# * Copyright (c) 2014-present, Yann Collet, Facebook, Inc.
+# Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
-# * All rights reserved.
+# 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.
 #
-# You can contact the author at :
+# This source code is licensed under both the BSD-style license (found in the
-#  - zstd homepage : http://www.zstd.net/
+# 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).
 # ################################################################
 
 PROJECT(libzstd)
@@ -151,10 +148,10 @@ IF (UNIX)
 ENDIF (UNIX)
 
 # install target
-INSTALL(FILES 
+INSTALL(FILES
-    ${LIBRARY_DIR}/zstd.h 
+    ${LIBRARY_DIR}/zstd.h
-    ${LIBRARY_DIR}/deprecated/zbuff.h 
+    ${LIBRARY_DIR}/deprecated/zbuff.h
-    ${LIBRARY_DIR}/dictBuilder/zdict.h 
+    ${LIBRARY_DIR}/dictBuilder/zdict.h
     ${LIBRARY_DIR}/common/zstd_errors.h
     DESTINATION "include")
 

contrib/adaptive-compression/adapt.c

@@ -1,10 +1,10 @@
-/**
+/*
  * Copyright (c) 2017-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 
 #include <stdio.h>      /* fprintf */

contrib/pzstd/Options.cpp

@@ -1,10 +1,10 @@
-/**
+/*
  * Copyright (c) 2016-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 #include "Options.h"
 #include "util.h"

contrib/pzstd/Pzstd.cpp

@@ -1,10 +1,10 @@
-/**
+/*
  * Copyright (c) 2016-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 #include "Pzstd.h"
 #include "SkippableFrame.h"

contrib/pzstd/test/OptionsTest.cpp

@@ -1,10 +1,10 @@
-/**
+/*
  * Copyright (c) 2016-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 #include "Options.h"
 

contrib/seekable_format/zstdseek_compress.c

@@ -1,10 +1,10 @@
-/**
+/*
  * Copyright (c) 2017-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 
 #include <stdlib.h>     /* malloc, free */

doc/educational_decoder/zstd_decompress.c

@@ -2,9 +2,9 @@
  * Copyright (c) 2017-present, Facebook, Inc.
  * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under both the BSD-style license (found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree) and the GPLv2 (found
- * of patent rights can be found in the PATENTS file in the same directory.
+ * in the COPYING file in the root directory of this source tree).
  */
 
 /// Zstandard educational decoder implementation
@@ -1289,7 +1289,7 @@ static void execute_sequences(frame_context_t *const ctx, ostream_t *const out,
     // Copy any leftover literals
     {
         size_t len = IO_istream_len(&litstream);
-        copy_literals(len, &litstream, out); 
+        copy_literals(len, &litstream, out);
         total_output += len;
     }
 

lib/Makefile

@@ -1,13 +1,11 @@
-# ##########################################################################
+# ################################################################
-# Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
+# Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
-# This Makefile is validated for Linux, macOS, *BSD, Hurd, Solaris, MSYS2 targets
+# 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
-# This source code is licensed under the BSD-style license found in the
+# in the COPYING file in the root directory of this source tree).
-# 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.
-# ##########################################################################
 
 # Version numbers
 LIBVER_MAJOR_SCRIPT:=`sed -n '/define ZSTD_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < ./zstd.h`

programs/Makefile

@@ -1,12 +1,10 @@
-# ##########################################################################
+# ################################################################
 # Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
-# This Makefile is validated for Linux, macOS, *BSD, Hurd, Solaris, MSYS2 targets
+# 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
-# This source code is licensed under the BSD-style license found in the
+# in the COPYING file in the root directory of this source tree).
-# 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.
 # ##########################################################################
 # zstd : Command Line Utility, supporting gzip-like arguments
 # zstd32 : Same as zstd, but forced to compile in 32-bits mode

tests/Makefile

@@ -1,13 +1,11 @@
-# ##########################################################################
+# ################################################################
-# Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
+# Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
-# This Makefile is validated for Linux, macOS, *BSD, Hurd, Solaris, MSYS2 targets
+# 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
-# This source code is licensed under the BSD-style license found in the
+# in the COPYING file in the root directory of this source tree).
-# 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.
-# ##########################################################################
 # datagen : Synthetic and parametrable data generator, for tests
 # fullbench  : Precisely measure speed for each zstd inner functions
 # fullbench32: Same as fullbench, but forced to compile in 32-bits mode

tests/test-zstd-speed.py

@@ -1,13 +1,13 @@
 #! /usr/bin/env python3
 
-#
+# ################################################################
 # Copyright (c) 2016-present, Przemyslaw Skibinski, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under both the BSD-style license (found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree) and the GPLv2 (found
-# of patent rights can be found in the PATENTS file in the same directory.
+# in the COPYING file in the root directory of this source tree).
-#
+# ##########################################################################
 
 # Limitations:
 # - doesn't support filenames with spaces

tests/test-zstd-versions.py

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 """Test zstd interoperability between versions"""
 
-#
+# ################################################################
 # Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
 # All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under both the BSD-style license (found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree) and the GPLv2 (found
-# of patent rights can be found in the PATENTS file in the same directory.
+# in the COPYING file in the root directory of this source tree).
-#
+# ################################################################
 
 import filecmp
 import glob