fixed a bunch of headers after license change (#825)

Makefile

@@ -1,10 +1,10 @@
 # ################################################################
-# Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
+# Copyright (c) 2015-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).
 # ################################################################
 
 PRGDIR   = programs

build/cmake/CMakeLists.txt

@@ -2,9 +2,9 @@
 # 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).
 # ################################################################
 
 PROJECT(zstd)

build/cmake/contrib/CMakeLists.txt

@@ -1,17 +1,13 @@
 # ################################################################
-# * Copyright (c) 2015-present, Yann Collet, Facebook, Inc.
+# Copyright (c) 2016-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(contrib)
 
 ADD_SUBDIRECTORY(pzstd)
 ADD_SUBDIRECTORY(gen_html)
-

build/cmake/contrib/gen_html/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(gen_html)

build/cmake/contrib/pzstd/CMakeLists.txt

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

contrib/gen_html/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).
-# ##########################################################################
+# ################################################################
 
 CFLAGS ?= -O3
 CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment

contrib/long_distance_matching/Makefile

@@ -1,10 +1,10 @@
 # ################################################################
-# Copyright (c) 2016-present, Facebook, Inc.
+# 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).
 # ################################################################
 
 # This Makefile presumes libzstd is installed, using `sudo make install`
@@ -34,4 +34,3 @@ clean:
 	@rm -f core *.o tmp* result* *.ldm *.ldm.dec \
 	ldm
 	@echo Cleaning completed
-

contrib/pzstd/ErrorHolder.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/Logging.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/Options.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/SkippableFrame.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 "SkippableFrame.h"
 #include "mem.h"

contrib/pzstd/SkippableFrame.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/main.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 "ErrorHolder.h"
 #include "Options.h"

contrib/pzstd/test/RoundTrip.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/Likely.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/ScopeGuard.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/ThreadPool.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/BufferTest.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/Range.h"

contrib/pzstd/utils/test/RangeTest.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/Range.h"
 

contrib/pzstd/utils/test/ResourcePoolTest.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/ResourcePool.h"
 

contrib/pzstd/utils/test/ScopeGuardTest.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/ScopeGuard.h"
 

contrib/pzstd/utils/test/ThreadPoolTest.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/ThreadPool.h"
 

contrib/seekable_format/examples/Makefile

@@ -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).
 # ################################################################
 
 # This Makefile presumes libzstd is built, using `make` in / or /lib/

examples/Makefile

@@ -2,9 +2,9 @@
 # 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).
 # ################################################################
 
 # This Makefile presumes libzstd is installed, using `sudo make install`

lib/common/threading.c

@@ -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

lib/dll/example/Makefile

@@ -1,11 +1,11 @@
-# ##########################################################################
+# ################################################################
 # 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).
-# ##########################################################################
+# ################################################################
 
 VOID    := /dev/null
 ZSTDDIR  := ../include

tests/fuzz/fuzz_helpers.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/simple_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/gzip/Makefile

@@ -1,10 +1,10 @@
 # ################################################################
-# Copyright (c) 2017-present, Yann Collet, Facebook, Inc.
+# 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).
 # ################################################################
 
 PRGDIR = ../../programs