Fix clang-tidy warnings, again

diff --git a/pdns/dnspcap2protobuf.cc b/pdns/dnspcap2protobuf.cc
index 00eed1deef28356870e18a6e5a11983770e2d0dd..6a997133005a6fca04dba84e9f451ff222fd4d4f 100644 (file)
--- 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 "<<argv[2]<<": "<<stringerror(error)<<endl;
     exit(EXIT_FAILURE);
   }

diff --git a/pdns/libssl.cc b/pdns/libssl.cc
index fcc0d8259d9fb847e5650b514164b66193204192..3f657326c432af1e6ab2190027be8ae31b5e331c 100644 (file)
--- a/pdns/libssl.cc
+++ b/pdns/libssl.cc
@@ -1040,7 +1040,8 @@ static void libssl_key_log_file_callback(const SSL* ssl, const char* line)
     return;
   }
 
-  auto filePtr = reinterpret_cast<FILE*>(SSL_CTX_get_ex_data(sslCtx, s_keyLogIndex));
+  // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast): OpenSSL's API
+  auto* filePtr = reinterpret_cast<FILE*>(SSL_CTX_get_ex_data(sslCtx, s_keyLogIndex));
   if (filePtr == nullptr) {
     return;
   }

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 7d2f683664375ac3796c56a2a237e022fd02a9f4..b69155daea766b3a1dd22a61d82cb253f60d33f1 100644 (file)
--- 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;
 }