From: Remi Gacogne Date: Mon, 18 Mar 2024 12:29:02 +0000 (+0100) Subject: Fix clang-tidy warnings, again X-Git-Tag: rec-5.1.0-alpha1~117^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13927%2Fhead;p=thirdparty%2Fpdns.git Fix clang-tidy warnings, again --- diff --git a/pdns/dnspcap2protobuf.cc b/pdns/dnspcap2protobuf.cc index 00eed1deef..6a99713300 100644 --- a/pdns/dnspcap2protobuf.cc +++ b/pdns/dnspcap2protobuf.cc @@ -63,9 +63,11 @@ try { PcapPacketReader pr(argv[1]); + // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic): it's argv.. auto filePtr = pdns::openFileForWriting(argv[2], 0600, true, false); if (!filePtr) { auto error = errno; + // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic): it's argv.. cerr<<"Error opening output file "<(SSL_CTX_get_ex_data(sslCtx, s_keyLogIndex)); + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast): OpenSSL's API + auto* filePtr = reinterpret_cast(SSL_CTX_get_ex_data(sslCtx, s_keyLogIndex)); if (filePtr == nullptr) { return; } diff --git a/pdns/misc.cc b/pdns/misc.cc index 7d2f683664..b69155daea 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -1789,14 +1789,14 @@ UniqueFilePtr openFileForWriting(const std::string& filePath, mode_t permissions } int fileDesc = open(filePath.c_str(), flags, permissions); if (fileDesc == -1) { - return UniqueFilePtr(nullptr); + return {}; } auto filePtr = pdns::UniqueFilePtr(fdopen(fileDesc, appendIfExists ? "a" : "w")); if (!filePtr) { auto error = errno; close(fileDesc); errno = error; - return UniqueFilePtr(nullptr); + return {}; } return filePtr; }