AuroraMiddleware/zstd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yann Collet 2017-08-31 11:24:54 -07:00
parent 9023898f1e
commit e9dc204f42
29 changed files with 124 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,10 +1,10 @@
# ################################################################ # ################################################################
# Copyright (c) 2016-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 # 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 PRGDIR = programs

6
build/cmake/CMakeLists.txt
View File

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

14
build/cmake/contrib/CMakeLists.txt
View File

@ -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) PROJECT(contrib)
ADD_SUBDIRECTORY(pzstd) ADD_SUBDIRECTORY(pzstd)
ADD_SUBDIRECTORY(gen_html) ADD_SUBDIRECTORY(gen_html)

13
build/cmake/contrib/gen_html/CMakeLists.txt
View File

@ -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) PROJECT(gen_html)

13
build/cmake/contrib/pzstd/CMakeLists.txt
View File

@ -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) PROJECT(pzstd)

10
contrib/gen_html/Makefile
View File

@ -1,11 +1,11 @@
# ########################################################################## # ################################################################
# Copyright (c) 2016-present, 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 # 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 ?= -O3
CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 -Wswitch-enum -Wno-comment

13
contrib/long_distance_matching/Makefile
View File

@ -1,10 +1,10 @@
# ################################################################ # ################################################################
# Copyright (c) 2016-present, Facebook, Inc. # Copyright (c) 2017-present, Facebook, Inc.
# All rights reserved. # 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` # This Makefile presumes libzstd is installed, using `sudo make install`
@ -25,8 +25,8 @@ LDFLAGS += -lzstd
default: all default: all
all: ldm all: ldm
ldm: ldm_common.c ldm.c main.c ldm: ldm_common.c ldm.c main.c
$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@
@ -34,4 +34,3 @@ clean:
@rm -f core *.o tmp* result* *.ldm *.ldm.dec \ @rm -f core *.o tmp* result* *.ldm *.ldm.dec \
ldm ldm
@echo Cleaning completed @echo Cleaning completed

8
contrib/pzstd/ErrorHolder.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/Logging.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/Options.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/SkippableFrame.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 "SkippableFrame.h"
#include "mem.h" #include "mem.h"

8
contrib/pzstd/SkippableFrame.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/main.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 "ErrorHolder.h"
#include "Options.h" #include "Options.h"

8
contrib/pzstd/test/RoundTrip.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/utils/Likely.h
View File

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

8
contrib/pzstd/utils/ScopeGuard.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/utils/ThreadPool.h
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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 #pragma once

8
contrib/pzstd/utils/test/BufferTest.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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/Buffer.h"
#include "utils/Range.h" #include "utils/Range.h"

8
contrib/pzstd/utils/test/RangeTest.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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" #include "utils/Range.h"

8
contrib/pzstd/utils/test/ResourcePoolTest.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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" #include "utils/ResourcePool.h"

8
contrib/pzstd/utils/test/ScopeGuardTest.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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" #include "utils/ScopeGuard.h"

8
contrib/pzstd/utils/test/ThreadPoolTest.cpp
View File

@ -1,10 +1,10 @@
/** /*
* Copyright (c) 2016-present, 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 * 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" #include "utils/ThreadPool.h"

6
contrib/seekable_format/examples/Makefile
View File

@ -2,9 +2,9 @@
# Copyright (c) 2017-present, Facebook, Inc. # Copyright (c) 2017-present, Facebook, Inc.
# All rights reserved. # 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/ # This Makefile presumes libzstd is built, using `make` in / or /lib/

6
examples/Makefile
View File

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

12
lib/common/threading.c
View File

@ -2,9 +2,9 @@
* Copyright (c) 2016 Tino Reichardt * Copyright (c) 2016 Tino Reichardt
* All rights reserved. * 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: * You can contact the author at:
* - zstdmt source repository: https://github.com/mcmilk/zstdmt * - zstdmt source repository: https://github.com/mcmilk/zstdmt
@ -15,9 +15,9 @@
*/ */
/* When ZSTD_MULTITHREAD is not defined, this file would become an empty translation unit. /* When ZSTD_MULTITHREAD is not defined, this file would become an empty translation unit.
* Include some ISO C header code to prevent this and portably avoid related warnings. * Include some ISO C header code to prevent this and portably avoid related warnings.
* (Visual C++: C4206 / GCC: -Wpedantic / Clang: -Wempty-translation-unit) * (Visual C++: C4206 / GCC: -Wpedantic / Clang: -Wempty-translation-unit)
*/ */
#include <stddef.h> #include <stddef.h>

10
lib/dll/example/Makefile
View File

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

8
tests/fuzz/fuzz_helpers.h
View File

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

10
tests/fuzz/simple_decompress.c
View File

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

10
tests/gzip/Makefile
View File

@ -1,10 +1,10 @@
# ################################################################ # ################################################################
# Copyright (c) 2017-present, Yann Collet, Facebook, Inc. # Copyright (c) 2017-present, Facebook, Inc.
# All rights reserved. # 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 PRGDIR = ../../programs
@ -12,7 +12,7 @@ VOID = /dev/null
export PATH := .:$(PATH) export PATH := .:$(PATH)
.PHONY: all .PHONY: all
#all: test-gzip-env #all: test-gzip-env
all: test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed all: test-helin-segv test-hufts test-keep test-list test-memcpy-abuse test-mixed
all: test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid all: test-null-suffix-clobber test-stdin test-trailing-nul test-unpack-invalid
all: test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix all: test-zdiff test-zgrep-context test-zgrep-f test-zgrep-signal test-znew-k test-z-suffix