From c0e275604fb0e08fb13523ed21c3630154e08d7f Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 9 Jun 2025 19:15:23 -0700
Subject: [PATCH] Fix clang-tidy modernize-loop-convert warnings in headers

---
 src/file_analysis/File.h    |  4 ++--
 src/input/ReaderBackend.h   | 10 +++++-----
 src/logging/WriterBackend.h | 10 +++++-----
 src/threading/Queue.h       |  2 ++
 src/zeekygen/Target.h       |  4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h
index 73fb384eb3..1fc5bfa1b4 100644
--- a/src/file_analysis/File.h
+++ b/src/file_analysis/File.h
@@ -333,8 +333,8 @@ protected:
     struct BOF_Buffer {
         BOF_Buffer() : full(false), size(0) {}
         ~BOF_Buffer() {
-            for ( size_t i = 0; i < chunks.size(); ++i )
-                delete chunks[i];
+            for ( auto* chunk : chunks )
+                delete chunk;
         }
 
         bool full;
diff --git a/src/input/ReaderBackend.h b/src/input/ReaderBackend.h
index ef9eee93e8..6e889ad0ef 100644
--- a/src/input/ReaderBackend.h
+++ b/src/input/ReaderBackend.h
@@ -118,17 +118,17 @@ public:
             name = other.name ? util::copy_string(other.name) : nullptr;
             mode = other.mode;
 
-            for ( config_map::const_iterator i = other.config.begin(); i != other.config.end(); i++ )
-                config.insert(std::make_pair(util::copy_string(i->first), util::copy_string(i->second)));
+            for ( const auto& [k, v] : other.config )
+                config.insert(std::make_pair(util::copy_string(k), util::copy_string(v)));
         }
 
         ~ReaderInfo() {
             delete[] source;
             delete[] name;
 
-            for ( config_map::iterator i = config.begin(); i != config.end(); i++ ) {
-                delete[] i->first;
-                delete[] i->second;
+            for ( auto [k, v] : config ) {
+                delete[] k;
+                delete[] v;
             }
         }
 
diff --git a/src/logging/WriterBackend.h b/src/logging/WriterBackend.h
index 4b096ca084..f6dc9e9861 100644
--- a/src/logging/WriterBackend.h
+++ b/src/logging/WriterBackend.h
@@ -106,8 +106,8 @@ public:
             rotation_base = other.rotation_base;
             network_time = other.network_time;
 
-            for ( config_map::const_iterator i = other.config.begin(); i != other.config.end(); i++ )
-                config.insert(std::make_pair(util::copy_string(i->first), util::copy_string(i->second)));
+            for ( const auto& [k, v] : other.config )
+                config.insert(std::make_pair(util::copy_string(k), util::copy_string(v)));
 
             filter_name = other.filter_name;
         }
@@ -116,9 +116,9 @@ public:
             delete[] path;
             delete[] post_proc_func;
 
-            for ( config_map::iterator i = config.begin(); i != config.end(); i++ ) {
-                delete[] i->first;
-                delete[] i->second;
+            for ( auto [k, v] : config ) {
+                delete[] k;
+                delete[] v;
             }
         }
 
diff --git a/src/threading/Queue.h b/src/threading/Queue.h
index 850c5f7bcd..6b2670c028 100644
--- a/src/threading/Queue.h
+++ b/src/threading/Queue.h
@@ -196,6 +196,7 @@ inline std::vector<std::unique_lock<std::mutex>> Queue<T>::LocksForAllQueues() {
     std::vector<std::unique_lock<std::mutex>> locks;
 
     try {
+        // NOLINTNEXTLINE(modernize-loop-convert)
         for ( int i = 0; i < NUM_QUEUES; i++ )
             locks.emplace_back(std::unique_lock<std::mutex>(mutex[i]));
     }
@@ -216,6 +217,7 @@ inline uint64_t Queue<T>::Size() {
 
     uint64_t size = 0;
 
+    // NOLINTNEXTLINE(modernize-loop-convert)
     for ( int i = 0; i < NUM_QUEUES; i++ )
         size += messages[i].size();
 
diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h
index 9251c58105..6fa90018b0 100644
--- a/src/zeekygen/Target.h
+++ b/src/zeekygen/Target.h
@@ -281,8 +281,8 @@ public:
     ScriptTarget(const std::string& name, const std::string& pattern) : Target(name, pattern), script_deps() {}
 
     ~ScriptTarget() override {
-        for ( size_t i = 0; i < pkg_deps.size(); ++i )
-            delete pkg_deps[i];
+        for ( auto* pkg : pkg_deps )
+            delete pkg;
     }
 
 protected: