Skip to content

Commit 21f8bd5

Browse files
eramongodberamongodb
authored
Reducing Warnings - Miscellaneous Warnings (#958)
* Fix unrecognized linker option warning on MSVC * Fix unknown option '-fPIC' warnings on MSVC * Fix format specifiers for size_t and ssize_t assertions * Replace C++-style comment with C90 compatible comment
1 parent 12b697c commit 21f8bd5

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

‎.evergreen/config.yml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,19 +1843,17 @@ tasks:
18431843
shell: bash
18441844
script: |-
18451845
set -o errexit
1846-
export CFLAGS="-fPIC"
18471846
export DEBUG="ON"
1848-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF"
1847+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF"
18491848
export SASL="AUTO"
18501849
export SKIP_MOCK_TESTS="ON"
18511850
export SSL="OPENSSL"
18521851
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
18531852
rm CMakeCache.txt
18541853
set -o errexit
1855-
export CFLAGS="-fPIC"
18561854
export COMPILE_LIBMONGOCRYPT="ON"
18571855
export DEBUG="ON"
1858-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
1856+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
18591857
export SASL="AUTO"
18601858
export SSL="OPENSSL"
18611859
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
@@ -1875,19 +1873,17 @@ tasks:
18751873
shell: bash
18761874
script: |-
18771875
set -o errexit
1878-
export CFLAGS="-fPIC"
18791876
export DEBUG="ON"
1880-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF"
1877+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF"
18811878
export SASL="AUTO"
18821879
export SKIP_MOCK_TESTS="ON"
18831880
export SSL="OPENSSL_STATIC"
18841881
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
18851882
rm CMakeCache.txt
18861883
set -o errexit
1887-
export CFLAGS="-fPIC"
18881884
export COMPILE_LIBMONGOCRYPT="ON"
18891885
export DEBUG="ON"
1890-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
1886+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
18911887
export SASL="AUTO"
18921888
export SSL="OPENSSL_STATIC"
18931889
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
@@ -1907,19 +1903,17 @@ tasks:
19071903
shell: bash
19081904
script: |-
19091905
set -o errexit
1910-
export CFLAGS="-fPIC"
19111906
export DEBUG="ON"
1912-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF"
1907+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF"
19131908
export SASL="AUTO"
19141909
export SKIP_MOCK_TESTS="ON"
19151910
export SSL="DARWIN"
19161911
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
19171912
rm CMakeCache.txt
19181913
set -o errexit
1919-
export CFLAGS="-fPIC"
19201914
export COMPILE_LIBMONGOCRYPT="ON"
19211915
export DEBUG="ON"
1922-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
1916+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
19231917
export SASL="AUTO"
19241918
export SSL="DARWIN"
19251919
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
@@ -1939,19 +1933,17 @@ tasks:
19391933
shell: bash
19401934
script: |-
19411935
set -o errexit
1942-
export CFLAGS="-fPIC"
19431936
export DEBUG="ON"
1944-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF"
1937+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF"
19451938
export SASL="AUTO"
19461939
export SKIP_MOCK_TESTS="ON"
19471940
export SSL="WINDOWS"
19481941
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
19491942
rm CMakeCache.txt
19501943
set -o errexit
1951-
export CFLAGS="-fPIC"
19521944
export COMPILE_LIBMONGOCRYPT="ON"
19531945
export DEBUG="ON"
1954-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
1946+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
19551947
export SASL="AUTO"
19561948
export SSL="WINDOWS"
19571949
CC='${CC}' MARCH='${MARCH}' sh .evergreen/compile.sh
@@ -1969,10 +1961,10 @@ tasks:
19691961
shell: bash
19701962
script: |-
19711963
set -o errexit
1972-
export CFLAGS="-fPIC -fsanitize=address -fno-omit-frame-pointer -DBSON_MEMCHECK"
1964+
export CFLAGS="-fsanitize=address -fno-omit-frame-pointer -DBSON_MEMCHECK"
19731965
export CHECK_LOG="ON"
19741966
export DEBUG="ON"
1975-
export EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF -DENABLE_EXTRA_ALIGNMENT=OFF"
1967+
export EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF -DENABLE_EXTRA_ALIGNMENT=OFF"
19761968
export PATH="/usr/lib/llvm-3.8/bin:$PATH"
19771969
export SKIP_MOCK_TESTS="ON"
19781970
export SSL="OPENSSL"

‎CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ include(MongoC-Warnings)
8383

8484
# Enable CCache, if possible
8585
include (CCache)
86+
8687
# Link with LLD, if possible
87-
include (LLDLinker)
88+
if (NOT MSVC)
89+
include (LLDLinker)
90+
endif ()
8891

8992
set (BUILD_VERSION "0.0.0" CACHE STRING "Library version (for both libbson and libmongoc)")
9093

‎build/evergreen_config_lib/tasks.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,16 @@ def __init__(self, *args, **kwargs):
9898
# First, compile and install without CSE.
9999
# Then, compile and install libmongocrypt.
100100
compile_with_cse = CompileTask(*args,
101-
CFLAGS="-fPIC",
102101
COMPILE_LIBMONGOCRYPT="ON",
103-
EXTRA_CONFIGURE_FLAGS="-DENABLE_CLIENT_SIDE_ENCRYPTION=ON",
102+
EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=ON",
104103
**kwargs).to_dict()
105104
extra_script = "rm CMakeCache.txt\n" + \
106105
compile_with_cse["commands"][0]["params"]["script"]
107106

108107
# Skip running mock server tests, because those were already run in the non-CSE build.
109-
super(CompileWithClientSideEncryption, self).__init__(*args, CFLAGS="-fPIC",
108+
super(CompileWithClientSideEncryption, self).__init__(*args,
110109
extra_script=extra_script,
111-
EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF",
110+
EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF",
112111
SKIP_MOCK_TESTS="ON",
113112
**kwargs)
114113
self.add_tags('client-side-encryption', 'special')
@@ -128,10 +127,10 @@ def __init__(self, *args, **kwargs):
128127

129128
# Skip running mock server tests, because those were already run in the non-CSE build.
130129
super(CompileWithClientSideEncryptionAsan, self).__init__(*args,
131-
CFLAGS="-fPIC -fsanitize=address -fno-omit-frame-pointer -DBSON_MEMCHECK",
130+
CFLAGS="-fsanitize=address -fno-omit-frame-pointer -DBSON_MEMCHECK",
132131
extra_script=extra_script,
133132
CHECK_LOG="ON",
134-
EXTRA_CONFIGURE_FLAGS="-DENABLE_MONGOC=OFF -DENABLE_EXTRA_ALIGNMENT=OFF",
133+
EXTRA_CONFIGURE_FLAGS="-DENABLE_PIC=ON -DENABLE_MONGOC=OFF -DENABLE_EXTRA_ALIGNMENT=OFF",
135134
PATH='/usr/lib/llvm-3.8/bin:$PATH',
136135
SKIP_MOCK_TESTS="ON",
137136
**kwargs)

‎src/kms-message/src/kms_request_str.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ kms_request_str_append_stripped (kms_request_str_t *str,
324324

325325
kms_request_str_reserve (str, appended->len);
326326

327-
// msvcrt is unhappy when it gets non-ANSI characters in isspace
327+
/* msvcrt is unhappy when it gets non-ANSI characters in isspace */
328328
while (*src >= 0 && isspace (*src)) {
329329
++src;
330330
}

‎src/libmongoc/tests/TestSuite.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ _test_error (const char *format, ...) BSON_GNUC_PRINTF (1, 2);
274274
ASSERT_CMPINT_HELPER (a, eq, b, PRIu32, uint32_t)
275275
#define ASSERT_CMPUINT64(a, eq, b) \
276276
ASSERT_CMPINT_HELPER (a, eq, b, PRIu64, uint64_t)
277-
#define ASSERT_CMPSIZE_T(a, eq, b) ASSERT_CMPINT_HELPER (a, eq, b, "zd", size_t)
277+
#define ASSERT_CMPSIZE_T(a, eq, b) ASSERT_CMPINT_HELPER (a, eq, b, "zu", size_t)
278278
#define ASSERT_CMPSSIZE_T(a, eq, b) \
279-
ASSERT_CMPINT_HELPER (a, eq, b, "zx", ssize_t)
279+
ASSERT_CMPINT_HELPER (a, eq, b, "zd", ssize_t)
280280
#define ASSERT_CMPDOUBLE(a, eq, b) ASSERT_CMPINT_HELPER (a, eq, b, "f", double)
281281
#define ASSERT_CMPVOID(a, eq, b) ASSERT_CMPINT_HELPER (a, eq, b, "p", void *)
282282

0 commit comments

Comments
 (0)