From 46e67a749a122d6056f2b5ee391695c3bd9bffda Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Wed, 14 May 2025 18:02:11 -0700
Subject: [PATCH] Fix clang-tidy modernize-min-max-use-initializer-list
 findings

---
 .clang-tidy          | 1 +
 src/Discard.cc       | 2 +-
 src/SmithWaterman.cc | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index b550b10714..2cf5aba5a0 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -4,6 +4,7 @@ Checks: [-*,
 
          modernize-loop-convert,
          modernize-make-unique,
+         modernize-min-max-use-initializer-list,
 
          # Enable a very limited number of the cppcoreguidelines checkers.
          # See the notes for some of the rest of them below.
diff --git a/src/Discard.cc b/src/Discard.cc
index 8ad64a880e..07c55fc874 100644
--- a/src/Discard.cc
+++ b/src/Discard.cc
@@ -134,7 +134,7 @@ Val* Discarder::BuildData(const u_char* data, int hdrlen, int len, int caplen) {
     caplen -= hdrlen;
     data += hdrlen;
 
-    len = std::max(std::min(std::min(len, caplen), discarder_maxlen), 0);
+    len = std::max(std::min({len, caplen, discarder_maxlen}), 0);
 
     return new StringVal(new String(data, len, true));
 }
diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc
index 1f6248bfc0..10b0385bae 100644
--- a/src/SmithWaterman.cc
+++ b/src/SmithWaterman.cc
@@ -425,7 +425,7 @@ Substring::Vec* smith_waterman(const String* s1, const String* s2, SWParams& par
             if ( current->swn_byte_assigned )
                 current->swn_score = score_tl;
             else
-                current->swn_score = std::max(std::max(score_t, score_l), score_tl);
+                current->swn_score = std::max({score_t, score_l, score_tl});
 
             // Establish predecessor chain according to neighbor
             // with best score.