fixed more file headers after license change (#825)

NEWS

@@ -1,7 +1,8 @@
 v1.3.2
+license : changed /examples license to BSD + GPLv2
+license : fix a few header files to reflect new license (#825)
 fix : a rare compression bug when compression generates very large distances (only possible at --ultra -22)
 build: better compatibility with reproducible builds, by Bernhard M. Wiedemann (@bmwiedemann) (#818)
-changed : examples license changed to BSD + GPLv2
 
 v1.3.1
 New license : BSD + GPLv2

build/cmake/programs/CMakeLists.txt

@@ -1,13 +1,10 @@
 # ################################################################
-# * Copyright (c) 2015-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(programs)

contrib/adaptive-compression/datagencli.c

@@ -1,10 +1,10 @@
-/**
+/*
  * 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).
  */
 
 

contrib/gen_html/gen_html.cpp

@@ -2,9 +2,9 @@
  * Copyright (c) 2016-present, Przemyslaw Skibinski, 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 <iostream>

contrib/pzstd/Makefile

@@ -1,11 +1,11 @@
-# ##########################################################################
+# ################################################################
 # 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).
-# ##########################################################################
+# ################################################################
 
 # Standard variables for installation
 DESTDIR ?=

contrib/pzstd/Pzstd.h

@@ -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).
  */
 #pragma once
 

contrib/pzstd/test/PzstdTest.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"
 extern "C" {

contrib/pzstd/test/RoundTripTest.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).
  */
 extern "C" {
 #include "datagen.h"

contrib/pzstd/utils/Buffer.h

@@ -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).
  */
 #pragma once
 

contrib/pzstd/utils/FileSystem.h

@@ -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).
  */
 #pragma once
 

contrib/pzstd/utils/Range.h

@@ -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).
  */
  
 /**

contrib/pzstd/utils/ResourcePool.h

@@ -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).
  */
 #pragma once
 

contrib/pzstd/utils/WorkQueue.h

@@ -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).
  */
 #pragma once
 

contrib/pzstd/utils/test/WorkQueueTest.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 "utils/Buffer.h"
 #include "utils/WorkQueue.h"

doc/educational_decoder/harness.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).
  */
 
 #include <stdio.h>

doc/educational_decoder/zstd_decompress.h

@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2017-present, Facebook, Inc.
+ * 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).
  */
 
 /******* EXPOSED TYPES ********************************************************/

lib/common/threading.h

@@ -2,9 +2,9 @@
  * Copyright (c) 2016 Tino Reichardt
  * 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).
  *
  * You can contact the author at:
  * - zstdmt source repository: https://github.com/mcmilk/zstdmt

tests/fuzz/Makefile

@@ -1,13 +1,11 @@
-# ##########################################################################
+# ################################################################
 # Copyright (c) 2016-present, Facebook, Inc.
 # All rights reserved.
 #
-# This Makefile is validated for Linux, and macOS 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.
-# ##########################################################################
 
 CFLAGS ?= -O3
 CXXFLAGS ?= -O3

tests/fuzz/fuzz.h

@@ -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).
  */
 
 /**

tests/fuzz/regression_driver.c

@@ -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 "fuzz.h"

tests/fuzz/simple_round_trip.c

@@ -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).
  */
 
 /**

tests/fuzz/stream_decompress.c

@@ -1,10 +1,10 @@
-/**
+/*
- * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
+ * 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).
  */
 
 /**

tests/fuzz/stream_round_trip.c

@@ -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).
  */
 
 /**