From ad4694f5297e9b19313c5c7726f685947759198c Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Fri, 25 Apr 2025 15:13:02 -0700
Subject: [PATCH] Fix clang-tidy performance-move-const-argument warnings
 (moving trivially copyable)

---
 src/ScannedFile.cc    |  2 +-
 src/broker/Manager.cc | 12 ++++++------
 src/spicy/manager.cc  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ScannedFile.cc b/src/ScannedFile.cc
index 16e538468c..00307be9dc 100644
--- a/src/ScannedFile.cc
+++ b/src/ScannedFile.cc
@@ -49,6 +49,6 @@ bool ScannedFile::AlreadyScanned() const {
 SignatureFile::SignatureFile(std::string file) : file(std::move(file)) {}
 
 SignatureFile::SignatureFile(std::string file, std::string full_path, Location load_location)
-    : file(std::move(file)), full_path(std::move(full_path)), load_location(std::move(load_location)) {}
+    : file(std::move(file)), full_path(std::move(full_path)), load_location(load_location) {}
 
 } // namespace zeek::detail
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 744e6578b0..2fe8e6dcbd 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -539,7 +539,7 @@ void Manager::DoInitPostScript() {
         reporter->FatalError("Invalid Broker::web_socket_overflow_policy: %s", web_socket_overflow_policy);
     }
 
-    broker::configuration config{std::move(options)};
+    broker::configuration config{options};
 
     config.openssl_cafile(get_option("Broker::ssl_cafile")->AsString()->CheckString());
     config.openssl_capath(get_option("Broker::ssl_capath")->AsString()->CheckString());
@@ -911,7 +911,7 @@ bool Manager::PublishIdentifier(std::string topic, std::string id) {
         return false;
     }
 
-    broker::zeek::IdentifierUpdate msg(std::move(id), std::move(data.value_));
+    broker::zeek::IdentifierUpdate msg(std::move(id), data.value_);
     DBG_LOG(DBG_BROKER, "Publishing id-update: %s", RenderMessage(topic, msg.as_data()).c_str());
     bstate->endpoint.publish(std::move(topic), msg.move_data());
     num_ids_outgoing_metric->Inc();
@@ -952,8 +952,8 @@ bool Manager::PublishLogCreate(EnumVal* stream, EnumVal* writer, const logging::
     }
 
     std::string topic = default_log_topic_prefix + stream_id;
-    auto bstream_id = broker::enum_value(std::move(stream_id));
-    auto bwriter_id = broker::enum_value(std::move(writer_id));
+    auto bstream_id = broker::enum_value(stream_id);
+    auto bwriter_id = broker::enum_value(writer_id);
     broker::zeek::LogCreate msg(std::move(bstream_id), std::move(bwriter_id), std::move(writer_info),
                                 std::move(fields_data));
 
@@ -1029,8 +1029,8 @@ bool Manager::PublishLogWrite(EnumVal* stream, EnumVal* writer, const string& pa
 
     std::string topic = v->AsString()->CheckString();
 
-    auto bstream_id = broker::enum_value(std::move(stream_id));
-    auto bwriter_id = broker::enum_value(std::move(writer_id));
+    auto bstream_id = broker::enum_value(stream_id);
+    auto bwriter_id = broker::enum_value(writer_id);
     broker::zeek::LogWrite msg(std::move(bstream_id), std::move(bwriter_id), std::move(path), std::move(serial_data));
 
     DBG_LOG(DBG_BROKER, "Buffering log record: %s", RenderMessage(topic, msg.as_data()).c_str());
diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc
index cf7f2db584..9253d4f3aa 100644
--- a/src/spicy/manager.cc
+++ b/src/spicy/manager.cc
@@ -636,7 +636,7 @@ void Manager::InitPostScript() {
     auto spicy_config = ::spicy::rt::configuration::get();
     spicy_config.hook_accept_input = hook_accept_input;
     spicy_config.hook_decline_input = hook_decline_input;
-    ::spicy::rt::configuration::set(std::move(spicy_config));
+    ::spicy::rt::configuration::set(spicy_config);
 
     try {
         ::hilti::rt::init();