From 11a1d8d5063b6a4edb5c5d526dee9f3453ab9e1e Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 25 Apr 2025 13:41:30 -0700
Subject: [PATCH] Fix clang-tidy performance-avoid-endl warnings

---
 .clang-tidy                      |  1 +
 src/logging/writers/none/None.cc | 15 ++++++++-------
 src/spicy/manager.cc             | 10 ++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index aefd43816f..314521eece 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,6 @@
 Checks: [-*,
          bugprone-*,
+         performance-avoid-endl,
 
          # Skipping these temporarily because they are very noisy
          -bugprone-narrowing-conversions,
diff --git a/src/logging/writers/none/None.cc b/src/logging/writers/none/None.cc
index d17870e331..73affacb9d 100644
--- a/src/logging/writers/none/None.cc
+++ b/src/logging/writers/none/None.cc
@@ -11,10 +11,10 @@ namespace zeek::logging::writer::detail {
 
 bool None::DoInit(const WriterInfo& info, int num_fields, const threading::Field* const* fields) {
     if ( BifConst::LogNone::debug ) {
-        std::cout << "[logging::writer::None]" << std::endl;
-        std::cout << "  path=" << info.path << std::endl;
-        std::cout << "  rotation_interval=" << info.rotation_interval << std::endl;
-        std::cout << "  rotation_base=" << info.rotation_base << std::endl;
+        std::cout << "[logging::writer::None]\n";
+        std::cout << "  path=" << info.path << "\n";
+        std::cout << "  rotation_interval=" << info.rotation_interval << "\n";
+        std::cout << "  rotation_base=" << info.rotation_base << "\n";
 
         // Output the config sorted by keys.
 
@@ -26,14 +26,15 @@ bool None::DoInit(const WriterInfo& info, int num_fields, const threading::Field
         std::sort(keys.begin(), keys.end());
 
         for ( std::vector<std::pair<std::string, std::string>>::const_iterator i = keys.begin(); i != keys.end(); i++ )
-            std::cout << "  config[" << (*i).first << "] = " << (*i).second << std::endl;
+            std::cout << "  config[" << (*i).first << "] = " << (*i).second << "\n";
 
         for ( int i = 0; i < num_fields; i++ ) {
             const threading::Field* field = fields[i];
-            std::cout << "  field " << field->name << ": " << type_name(field->type) << std::endl;
+            std::cout << "  field " << field->name << ": " << type_name(field->type) << "\n";
         }
 
-        std::cout << std::endl;
+        std::cout << "\n";
+        std::cout << std::flush;
     }
 
     return true;
diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc
index acddad19a8..cf7f2db584 100644
--- a/src/spicy/manager.cc
+++ b/src/spicy/manager.cc
@@ -642,14 +642,12 @@ void Manager::InitPostScript() {
         ::hilti::rt::init();
         ::spicy::rt::init();
     } catch ( const hilti::rt::Exception& e ) {
-        std::cerr << hilti::rt::fmt("uncaught runtime exception %s during initialization: %s",
-                                    hilti::rt::demangle(typeid(e).name()), e.what())
-                  << std::endl;
+        std::cerr << hilti::rt::fmt("uncaught runtime exception %s during initialization: %s\n",
+                                    hilti::rt::demangle(typeid(e).name()), e.what());
         exit(1);
     } catch ( const std::runtime_error& e ) {
-        std::cerr << hilti::rt::fmt("uncaught C++ exception %s during initialization: %s",
-                                    hilti::rt::demangle(typeid(e).name()), e.what())
-                  << std::endl;
+        std::cerr << hilti::rt::fmt("uncaught C++ exception %s during initialization: %s\n",
+                                    hilti::rt::demangle(typeid(e).name()), e.what());
         exit(1);
     }