Skip to content

Commit e1ea4b7

Browse files
senhuang42senhuang42
committed
Remove ZSTD_compress.c dependencies on deprecated functions
1 parent 5139fdb commit e1ea4b7

File tree

21 files changed

+160
-102
lines changed

21 files changed

+160
-102
lines changed

‎TESTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ They consist of the following tests:
4040
- Versions test (ensuring `zstd` can decode files from all previous versions)
4141
- `pzstd` with asan and tsan, as well as in 32-bits mode
4242
- Testing `zstd` with legacy mode off
43-
- Testing `zbuff` (old streaming API)
4443
- Entire test suite and make install on macOS

‎build/VS2008/fullbench/fullbench.vcproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
Name="VCCLCompilerTool"
4646
Optimization="0"
4747
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
48-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
48+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE"
4949
MinimalRebuild="true"
5050
BasicRuntimeChecks="3"
5151
RuntimeLibrary="3"
@@ -121,7 +121,7 @@
121121
EnableIntrinsicFunctions="true"
122122
OmitFramePointers="true"
123123
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
124-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
124+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;NDEBUG;_CONSOLE"
125125
RuntimeLibrary="0"
126126
EnableFunctionLevelLinking="true"
127127
UsePrecompiledHeader="0"
@@ -195,7 +195,7 @@
195195
Name="VCCLCompilerTool"
196196
Optimization="0"
197197
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
198-
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
198+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE"
199199
MinimalRebuild="true"
200200
BasicRuntimeChecks="3"
201201
RuntimeLibrary="3"
@@ -272,7 +272,7 @@
272272
EnableIntrinsicFunctions="true"
273273
OmitFramePointers="true"
274274
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
275-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
275+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;NDEBUG;_CONSOLE"
276276
RuntimeLibrary="0"
277277
EnableFunctionLevelLinking="true"
278278
UsePrecompiledHeader="0"

‎build/VS2008/fuzzer/fuzzer.vcproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
Name="VCCLCompilerTool"
4646
Optimization="0"
4747
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
48-
PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
48+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
4949
MinimalRebuild="true"
5050
BasicRuntimeChecks="3"
5151
RuntimeLibrary="3"
@@ -121,7 +121,7 @@
121121
EnableIntrinsicFunctions="true"
122122
OmitFramePointers="true"
123123
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
124-
PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
124+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
125125
RuntimeLibrary="0"
126126
EnableFunctionLevelLinking="true"
127127
UsePrecompiledHeader="0"
@@ -195,7 +195,7 @@
195195
Name="VCCLCompilerTool"
196196
Optimization="0"
197197
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
198-
PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
198+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
199199
MinimalRebuild="true"
200200
BasicRuntimeChecks="3"
201201
RuntimeLibrary="3"
@@ -272,7 +272,7 @@
272272
EnableIntrinsicFunctions="true"
273273
OmitFramePointers="true"
274274
AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\programs"
275-
PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
275+
PreprocessorDefinitions="ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
276276
RuntimeLibrary="0"
277277
EnableFunctionLevelLinking="true"
278278
UsePrecompiledHeader="0"

‎build/VS2010/fullbench-dll/fullbench-dll.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</PrecompiledHeader>
9191
<WarningLevel>Level4</WarningLevel>
9292
<Optimization>Disabled</Optimization>
93-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<TreatWarningAsError>true</TreatWarningAsError>
9595
<EnablePREfast>false</EnablePREfast>
9696
</ClCompile>
@@ -108,7 +108,7 @@
108108
</PrecompiledHeader>
109109
<WarningLevel>Level4</WarningLevel>
110110
<Optimization>Disabled</Optimization>
111-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112112
<TreatWarningAsError>true</TreatWarningAsError>
113113
<EnablePREfast>false</EnablePREfast>
114114
</ClCompile>
@@ -127,7 +127,7 @@
127127
<Optimization>MaxSpeed</Optimization>
128128
<FunctionLevelLinking>true</FunctionLevelLinking>
129129
<IntrinsicFunctions>true</IntrinsicFunctions>
130-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131131
<EnablePREfast>false</EnablePREfast>
132132
<TreatWarningAsError>false</TreatWarningAsError>
133133
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -150,7 +150,7 @@
150150
<Optimization>MaxSpeed</Optimization>
151151
<FunctionLevelLinking>true</FunctionLevelLinking>
152152
<IntrinsicFunctions>true</IntrinsicFunctions>
153-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
153+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;ZSTD_DLL_IMPORT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154154
<TreatWarningAsError>false</TreatWarningAsError>
155155
<EnablePREfast>false</EnablePREfast>
156156
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build/VS2010/fullbench/fullbench.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</PrecompiledHeader>
9191
<WarningLevel>Level4</WarningLevel>
9292
<Optimization>Disabled</Optimization>
93-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<TreatWarningAsError>true</TreatWarningAsError>
9595
<EnablePREfast>false</EnablePREfast>
9696
</ClCompile>
@@ -105,7 +105,7 @@
105105
</PrecompiledHeader>
106106
<WarningLevel>Level4</WarningLevel>
107107
<Optimization>Disabled</Optimization>
108-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<TreatWarningAsError>true</TreatWarningAsError>
110110
<EnablePREfast>false</EnablePREfast>
111111
</ClCompile>
@@ -122,7 +122,7 @@
122122
<Optimization>MaxSpeed</Optimization>
123123
<FunctionLevelLinking>true</FunctionLevelLinking>
124124
<IntrinsicFunctions>true</IntrinsicFunctions>
125-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<EnablePREfast>false</EnablePREfast>
127127
<TreatWarningAsError>false</TreatWarningAsError>
128128
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -142,7 +142,7 @@
142142
<Optimization>MaxSpeed</Optimization>
143143
<FunctionLevelLinking>true</FunctionLevelLinking>
144144
<IntrinsicFunctions>true</IntrinsicFunctions>
145-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146146
<TreatWarningAsError>false</TreatWarningAsError>
147147
<EnablePREfast>false</EnablePREfast>
148148
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build/VS2010/fuzzer/fuzzer.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</PrecompiledHeader>
9191
<WarningLevel>Level4</WarningLevel>
9292
<Optimization>Disabled</Optimization>
93-
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<TreatWarningAsError>true</TreatWarningAsError>
9595
<EnablePREfast>false</EnablePREfast>
9696
</ClCompile>
@@ -105,7 +105,7 @@
105105
</PrecompiledHeader>
106106
<WarningLevel>Level4</WarningLevel>
107107
<Optimization>Disabled</Optimization>
108-
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109109
<TreatWarningAsError>true</TreatWarningAsError>
110110
<EnablePREfast>false</EnablePREfast>
111111
</ClCompile>
@@ -122,7 +122,7 @@
122122
<Optimization>MaxSpeed</Optimization>
123123
<FunctionLevelLinking>true</FunctionLevelLinking>
124124
<IntrinsicFunctions>true</IntrinsicFunctions>
125-
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<EnablePREfast>false</EnablePREfast>
127127
<TreatWarningAsError>false</TreatWarningAsError>
128128
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -142,7 +142,7 @@
142142
<Optimization>MaxSpeed</Optimization>
143143
<FunctionLevelLinking>true</FunctionLevelLinking>
144144
<IntrinsicFunctions>true</IntrinsicFunctions>
145-
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
<PreprocessorDefinitions>ZSTD_DISABLE_DEPRECATE_WARNINGS=1;ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
146146
<TreatWarningAsError>false</TreatWarningAsError>
147147
<EnablePREfast>false</EnablePREfast>
148148
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>

‎build/cmake/lib/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,24 @@ file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
2424
file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
2525
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
2626
file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
27-
file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c)
2827

2928
set(Sources
3029
${CommonSources}
3130
${CompressSources}
3231
${DecompressSources}
33-
${DictBuilderSources}
34-
${DeprecatedSources})
32+
${DictBuilderSources})
3533

3634
file(GLOB CommonHeaders ${LIBRARY_DIR}/common/*.h)
3735
file(GLOB CompressHeaders ${LIBRARY_DIR}/compress/*.h)
3836
file(GLOB DecompressHeaders ${LIBRARY_DIR}/decompress/*.h)
3937
file(GLOB DictBuilderHeaders ${LIBRARY_DIR}/dictBuilder/*.h)
40-
file(GLOB DeprecatedHeaders ${LIBRARY_DIR}/deprecated/*.h)
4138

4239
set(Headers
4340
${LIBRARY_DIR}/zstd.h
4441
${CommonHeaders}
4542
${CompressHeaders}
4643
${DecompressHeaders}
47-
${DictBuilderHeaders}
48-
${DeprecatedHeaders})
44+
${DictBuilderHeaders})
4945

5046
if (ZSTD_LEGACY_SUPPORT)
5147
set(LIBRARY_LEGACY_DIR ${LIBRARY_DIR}/legacy)

‎build/cmake/tests/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,15 @@ target_link_libraries(datagen libzstd_static)
5757
# fullbench
5858
#
5959
add_executable(fullbench ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${PROGRAMS_DIR}/benchfn.c ${PROGRAMS_DIR}/benchzstd.c ${TESTS_DIR}/fullbench.c)
60+
set_property(TARGET fullbench APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_DISABLE_DEPRECATE_WARNINGS")
6061
target_link_libraries(fullbench libzstd_static)
6162
add_test(NAME fullbench COMMAND fullbench)
6263

6364
#
6465
# fuzzer
6566
#
6667
add_executable(fuzzer ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${TESTS_DIR}/fuzzer.c)
68+
set_property(TARGET fuzzer APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_DISABLE_DEPRECATE_WARNINGS")
6769
target_link_libraries(fuzzer libzstd_static)
6870
AddTestFlagsOption(ZSTD_FUZZER_FLAGS "$ENV{FUZZERTEST} $ENV{FUZZER_FLAGS}"
6971
"Semicolon-separated list of flags to pass to the fuzzer test (see `fuzzer -h` for usage)")
@@ -76,6 +78,7 @@ add_test(NAME fuzzer COMMAND fuzzer ${ZSTD_FUZZER_FLAGS})
7678
# zstreamtest
7779
#
7880
add_executable(zstreamtest ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/timefn.c ${TESTS_DIR}/seqgen.c ${TESTS_DIR}/zstreamtest.c)
81+
set_property(TARGET zstreamtest APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_DISABLE_DEPRECATE_WARNINGS")
7982
target_link_libraries(zstreamtest libzstd_static)
8083
AddTestFlagsOption(ZSTD_ZSTREAM_FLAGS "$ENV{ZSTREAM_TESTTIME} $ENV{FUZZER_FLAGS}"
8184
"Semicolon-separated list of flags to pass to the zstreamtest test (see `zstreamtest -h` for usage)")

‎build/meson/lib/meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ libzstd_includes = [include_directories(join_paths(zstd_rootdir,'lib'),
1414
join_paths(zstd_rootdir, 'lib/common'),
1515
join_paths(zstd_rootdir, 'lib/compress'),
1616
join_paths(zstd_rootdir, 'lib/decompress'),
17-
join_paths(zstd_rootdir, 'lib/dictBuilder'),
18-
join_paths(zstd_rootdir, 'lib/deprecated'))]
17+
join_paths(zstd_rootdir, 'lib/dictBuilder'))]
1918

2019
libzstd_sources = [join_paths(zstd_rootdir, 'lib/common/entropy_common.c'),
2120
join_paths(zstd_rootdir, 'lib/common/fse_decompress.c'),

‎contrib/VS2005/zstdlib/zstdlib.vcproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,6 @@
473473
RelativePath="..\..\..\lib\common\xxhash.h"
474474
>
475475
</File>
476-
<File
477-
RelativePath="..\..\..\lib\common\zbuff.h"
478-
>
479-
</File>
480476
<File
481477
RelativePath="..\..\..\lib\dictBuilder\zdict.h"
482478
>

0 commit comments

Comments
 (0)