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

Merge pull request #2259 from cwoffenden/vs-warning

Browse Source 
Fixed VS variable shadowing warning (single file lib)
This commit is contained in:
Yann Collet 2020-07-29 09:21:03 -07:00 committed by GitHub
commit bff41a4190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/single_file_libs/build_decoder_test.sh
View File

@ -12,7 +12,7 @@ IN_FILES="examples/emscripten.c"
# Emscripten build using emcc. # Emscripten build using emcc.
emscripten_emcc_build() { emscripten_emcc_build() {
# Compile the the same example as above # Compile the the same example as above
CC_FLAGS="-Wall -Wextra -Werror -Os -g0 -flto" CC_FLAGS="-Wall -Wextra -Wshadow -Werror -Os -g0 -flto"
emcc $CC_FLAGS -s WASM=1 -I. -o $OUT_WASM $IN_FILES emcc $CC_FLAGS -s WASM=1 -I. -o $OUT_WASM $IN_FILES
# Did compilation work? # Did compilation work?
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -66,7 +66,7 @@ fi
echo "Single file decoder creation script: PASSED" echo "Single file decoder creation script: PASSED"
# Compile the generated output # Compile the generated output
cc -Wall -Wextra -Werror -Os -g0 -o $OUT_FILE examples/simple.c cc -Wall -Wextra -Wshadow -Werror -Os -g0 -o $OUT_FILE examples/simple.c
# Did compilation work? # Did compilation work?
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Compiling simple.c: FAILED" echo "Compiling simple.c: FAILED"

4
contrib/single_file_libs/build_library_test.sh
View File

@ -15,7 +15,7 @@ IN_FILES="zstd.c examples/roundtrip.c"
# Emscripten build using emcc. # Emscripten build using emcc.
emscripten_emcc_build() { emscripten_emcc_build() {
# Compile the the same example as above # Compile the the same example as above
CC_FLAGS="-Wall -Wextra -Werror -Os -g0 -flto" CC_FLAGS="-Wall -Wextra -Wshadow -Werror -Os -g0 -flto"
emcc $CC_FLAGS -s WASM=1 -I. -o $OUT_WASM $IN_FILES emcc $CC_FLAGS -s WASM=1 -I. -o $OUT_WASM $IN_FILES
# Did compilation work? # Did compilation work?
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -72,7 +72,7 @@ echo "Single file library creation script: PASSED"
cp "$ZSTD_SRC_ROOT/zstd.h" zstd.h cp "$ZSTD_SRC_ROOT/zstd.h" zstd.h
# Compile the generated output # Compile the generated output
cc -Wall -Wextra -Werror -pthread -I. -Os -g0 -o $OUT_FILE zstd.c examples/roundtrip.c cc -Wall -Wextra -Werror -Wshadow -pthread -I. -Os -g0 -o $OUT_FILE zstd.c examples/roundtrip.c
# Did compilation work? # Did compilation work?
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Compiling roundtrip.c: FAILED" echo "Compiling roundtrip.c: FAILED"

4
lib/dictBuilder/cover.c
View File

@ -63,13 +63,13 @@ static int g_displayLevel = 2;
#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__) #define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
#ifndef LOCALDISPLAYUPDATE #ifndef LOCALDISPLAYUPDATE
static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100; static const clock_t g_refreshRate = CLOCKS_PER_SEC * 15 / 100;
static clock_t g_time = 0; static clock_t g_time = 0;
#endif #endif
#undef LOCALDISPLAYUPDATE #undef LOCALDISPLAYUPDATE
#define LOCALDISPLAYUPDATE(displayLevel, l, ...) \ #define LOCALDISPLAYUPDATE(displayLevel, l, ...) \
if (displayLevel >= l) { \ if (displayLevel >= l) { \
if ((clock() - g_time > refreshRate) || (displayLevel >= 4)) { \ if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) { \
g_time = clock(); \ g_time = clock(); \
DISPLAY(__VA_ARGS__); \ DISPLAY(__VA_ARGS__); \
} \ } \

4
lib/dictBuilder/fastcover.c
View File

@ -60,13 +60,13 @@ static int g_displayLevel = 2;
#define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__) #define DISPLAYLEVEL(l, ...) LOCALDISPLAYLEVEL(g_displayLevel, l, __VA_ARGS__)
#ifndef LOCALDISPLAYUPDATE #ifndef LOCALDISPLAYUPDATE
static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100; static const clock_t g_refreshRate = CLOCKS_PER_SEC * 15 / 100;
static clock_t g_time = 0; static clock_t g_time = 0;
#endif #endif
#undef LOCALDISPLAYUPDATE #undef LOCALDISPLAYUPDATE
#define LOCALDISPLAYUPDATE(displayLevel, l, ...) \ #define LOCALDISPLAYUPDATE(displayLevel, l, ...) \
if (displayLevel >= l) { \ if (displayLevel >= l) { \
if ((clock() - g_time > refreshRate) || (displayLevel >= 4)) { \ if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) { \
g_time = clock(); \ g_time = clock(); \
DISPLAY(__VA_ARGS__); \ DISPLAY(__VA_ARGS__); \
} \ } \