From 8f9e3cde23444f73a8e2acc1153f351eb08e7e18 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 16 Mar 2025 09:11:55 +0100
Subject: [PATCH] chore: add more clang-tidy diagnostic suppressions

---
 src/library_dependencies.cpp           | 1 +
 src/reader/filesystem_v2.cpp           | 2 +-
 src/reader/internal/metadata_types.cpp | 2 +-
 src/reader/internal/metadata_v2.cpp    | 2 +-
 src/writer/internal/entry.cpp          | 2 +-
 src/writer/internal/inode_manager.cpp  | 2 +-
 tools/src/dwarfs_main.cpp              | 2 ++
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/library_dependencies.cpp b/src/library_dependencies.cpp
index 8316ee9c..1afe6e03 100644
--- a/src/library_dependencies.cpp
+++ b/src/library_dependencies.cpp
@@ -61,6 +61,7 @@ std::string get_jemalloc_version() {
   j = JEMALLOC_VERSION;
 #else
   size_t s = sizeof(j);
+  // NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
   ::mallctl("version", &j, &s, nullptr, 0);
 #endif
   std::string rv{j};
diff --git a/src/reader/filesystem_v2.cpp b/src/reader/filesystem_v2.cpp
index 1f8b13c8..3a3997f9 100644
--- a/src/reader/filesystem_v2.cpp
+++ b/src/reader/filesystem_v2.cpp
@@ -113,7 +113,7 @@ try_get_block_decompressor(std::shared_ptr<mmif> mm, fs_section const& sec) {
   if (sec.check_fast(*mm)) {
     try {
       return get_block_decompressor(std::move(mm), sec);
-    } catch (std::exception const&) {
+    } catch (std::exception const&) { // NOLINT(bugprone-empty-catch)
     }
   }
 
diff --git a/src/reader/internal/metadata_types.cpp b/src/reader/internal/metadata_types.cpp
index 3d4ce11e..929732d4 100644
--- a/src/reader/internal/metadata_types.cpp
+++ b/src/reader/internal/metadata_types.cpp
@@ -768,7 +768,7 @@ check_metadata(logger& lgr, global_metadata::Meta const& meta, bool check) {
     }
   }
 
-  return meta;
+  return meta; // NOLINT(bugprone-return-const-ref-from-parameter)
 }
 
 template <typename T>
diff --git a/src/reader/internal/metadata_v2.cpp b/src/reader/internal/metadata_v2.cpp
index 28499e5e..6e4f1f09 100644
--- a/src/reader/internal/metadata_v2.cpp
+++ b/src/reader/internal/metadata_v2.cpp
@@ -150,7 +150,7 @@ check_metadata_consistency(logger& lgr, global_metadata::Meta const& meta,
   if (force_consistency_check) {
     global_metadata::check_consistency(lgr, meta);
   }
-  return meta;
+  return meta; // NOLINT(bugprone-return-const-ref-from-parameter)
 }
 
 void analyze_frozen(std::ostream& os,
diff --git a/src/writer/internal/entry.cpp b/src/writer/internal/entry.cpp
index 8b912f78..4e3f1a4b 100644
--- a/src/writer/internal/entry.cpp
+++ b/src/writer/internal/entry.cpp
@@ -265,7 +265,7 @@ void file::scan(mmif* mm, progress& prog,
       while (s >= chunk_size) {
         cs.update(mm->as<void>(offset), chunk_size);
         // release_until() is best-effort, we can ignore the return value
-        // NOLINTNEXTLINE(bugprone-unused-return-value)
+        // NOLINTNEXTLINE(bugprone-unused-return-value,cert-err33-c)
         mm->release_until(offset);
         offset += chunk_size;
         s -= chunk_size;
diff --git a/src/writer/internal/inode_manager.cpp b/src/writer/internal/inode_manager.cpp
index d8069804..f5e46328 100644
--- a/src/writer/internal/inode_manager.cpp
+++ b/src/writer/internal/inode_manager.cpp
@@ -386,7 +386,7 @@ class inode_ : public inode {
     while (size >= chunk_size) {
       scanner(mm->span(offset, chunk_size));
       // release_until() is best-effort, we can ignore the return value
-      // NOLINTNEXTLINE(bugprone-unused-return-value)
+      // NOLINTNEXTLINE(bugprone-unused-return-value,cert-err33-c)
       mm->release_until(offset);
       offset += chunk_size;
       size -= chunk_size;
diff --git a/tools/src/dwarfs_main.cpp b/tools/src/dwarfs_main.cpp
index b96332ca..c0ede62a 100644
--- a/tools/src/dwarfs_main.cpp
+++ b/tools/src/dwarfs_main.cpp
@@ -319,8 +319,10 @@ void checked_reply_err(LogProxy& log_, fuse_req_t req, T&& f) {
 #endif
 
 #if DWARFS_FUSE_LOWLEVEL
+// NOLINTBEGIN(bugprone-macro-parentheses)
 #define dUSERDATA                                                              \
   auto& userdata = *reinterpret_cast<dwarfs_userdata*>(fuse_req_userdata(req))
+// NOLINTEND(bugprone-macro-parentheses)
 #else
 #define dUSERDATA                                                              \
   auto& userdata =                                                             \