From c6c013e8a3ef72a60ce0cbc4e4fa97f894cec0bd Mon Sep 17 00:00:00 2001 From: Juan Gu Date: Thu, 25 Aug 2022 23:31:36 +0000 Subject: SERVER-69155 fix bugprone-suspicious-string-compare warnings --- .clang-tidy | 2 +- src/mongo/s/catalog/type_chunk.cpp | 2 +- src/mongo/s/catalog/type_tags.cpp | 2 +- src/mongo/util/md5main.cpp | 2 +- src/mongo/util/stacktrace_somap.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 2dd83cb1f84..3915da863cb 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -31,6 +31,7 @@ Checks: '-*, modernize-unary-static-assert, performance-implicit-conversion-in-loop, performance-inefficient-algorithm, + bugprone-suspicious-string-compare, -bugprone-argument-comment, -bugprone-exception-escape, -bugprone-forward-declaration-namespace, @@ -47,7 +48,6 @@ Checks: '-*, -bugprone-string-literal-with-embedded-nul, -bugprone-suspicious-missing-comma, -bugprone-suspicious-semicolon, - -bugprone-suspicious-string-compare, -bugprone-undefined-memory-manipulation, -bugprone-unused-return-value, -cert-err34-c, diff --git a/src/mongo/s/catalog/type_chunk.cpp b/src/mongo/s/catalog/type_chunk.cpp index 9def6f376b2..88fd1fc3aa1 100644 --- a/src/mongo/s/catalog/type_chunk.cpp +++ b/src/mongo/s/catalog/type_chunk.cpp @@ -555,7 +555,7 @@ Status ChunkType::validate() const { while (minIt.more() && maxIt.more()) { BSONElement minElem = minIt.next(); BSONElement maxElem = maxIt.next(); - if (strcmp(minElem.fieldName(), maxElem.fieldName())) { + if (strcmp(minElem.fieldName(), maxElem.fieldName()) != 0) { return {ErrorCodes::BadValue, str::stream() << "min and max don't have matching keys: " << *_min << ", " << *_max}; diff --git a/src/mongo/s/catalog/type_tags.cpp b/src/mongo/s/catalog/type_tags.cpp index 0edfc7eb5d8..b8a362ce576 100644 --- a/src/mongo/s/catalog/type_tags.cpp +++ b/src/mongo/s/catalog/type_tags.cpp @@ -119,7 +119,7 @@ Status TagsType::validate() const { while (minIt.more() && maxIt.more()) { BSONElement minElem = minIt.next(); BSONElement maxElem = maxIt.next(); - if (strcmp(minElem.fieldName(), maxElem.fieldName())) { + if (strcmp(minElem.fieldName(), maxElem.fieldName()) != 0) { return Status(ErrorCodes::BadValue, "min and max have different set of keys"); } } diff --git a/src/mongo/util/md5main.cpp b/src/mongo/util/md5main.cpp index 27047713d55..87c6a7edb27 100644 --- a/src/mongo/util/md5main.cpp +++ b/src/mongo/util/md5main.cpp @@ -95,7 +95,7 @@ do_md5_test(void) { md5_finish(&state, digest); for (di = 0; di < 16; ++di) sprintf(hex_output + di * 2, "%02x", digest[di]); - if (strcmp(hex_output, test[i + 1])) { + if (strcmp(hex_output, test[i + 1]) != 0) { printf("MD5 (\"%s\") = ", test[i]); puts(hex_output); printf("**** ERROR, should be: %s\n", test[i + 1]); diff --git a/src/mongo/util/stacktrace_somap.cpp b/src/mongo/util/stacktrace_somap.cpp index 53d4f8cdc26..c2ed5ac84f8 100644 --- a/src/mongo/util/stacktrace_somap.cpp +++ b/src/mongo/util/stacktrace_somap.cpp @@ -149,7 +149,7 @@ void processLoadSegment(const dl_phdr_info& info, const ElfW(Phdr) & phdr, BSONO const char* filename = info.dlpi_name; - if (memcmp(&eHeader.e_ident[EI_MAG0], ELFMAG, SELFMAG)) { + if (memcmp(&eHeader.e_ident[EI_MAG0], ELFMAG, SELFMAG) != 0) { LOGV2_WARNING(23842, "Bad ELF magic number", "filename"_attr = filename, -- cgit v1.2.1