diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 7a72b9fd12..724d024a7e 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -1417,7 +1417,7 @@ void HTTP_Analyzer::HTTP_Upgrade() { analyzer_tag_val->GetType()->Lookup(analyzer_tag_val->AsEnum()), upgrade_protocol_val->CheckString()); auto analyzer_tag = analyzer_mgr->GetComponentTag(analyzer_tag_val.get()); - auto* analyzer = analyzer_mgr->InstantiateAnalyzer(std::move(analyzer_tag), Conn()); + auto* analyzer = analyzer_mgr->InstantiateAnalyzer(analyzer_tag, Conn()); if ( analyzer ) { AddChildAnalyzer(analyzer); diff --git a/src/broker/Data.cc b/src/broker/Data.cc index 5cfffd9cce..2284ac5fd6 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -741,7 +741,7 @@ std::optional val_to_data(const Val* v) { s.Prefix().CopyIPv6(&tmp); auto a = broker::address(reinterpret_cast(&tmp), broker::address::family::ipv6, broker::address::byte_order::network); - return {broker::subnet(std::move(a), s.Length())}; + return {broker::subnet(a, s.Length())}; } break; case TYPE_DOUBLE: return {v->AsDouble()}; case TYPE_TIME: { diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 2fe8e6dcbd..d3d7020cf9 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -954,8 +954,7 @@ bool Manager::PublishLogCreate(EnumVal* stream, EnumVal* writer, const logging:: std::string topic = default_log_topic_prefix + stream_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)); + broker::zeek::LogCreate msg(bstream_id, bwriter_id, writer_info, fields_data); DBG_LOG(DBG_BROKER, "Publishing log creation: %s", RenderMessage(topic, msg.as_data()).c_str()); @@ -1031,7 +1030,7 @@ bool Manager::PublishLogWrite(EnumVal* stream, EnumVal* writer, const string& pa 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)); + broker::zeek::LogWrite msg(bstream_id, bwriter_id, std::move(path), std::move(serial_data)); DBG_LOG(DBG_BROKER, "Buffering log record: %s", RenderMessage(topic, msg.as_data()).c_str()); @@ -1302,8 +1301,7 @@ void Manager::ProcessMessages() { // message. Since `topic` still points into the original memory // region, we may no longer access it after this point. auto topic_str = broker::get_topic_str(message); - broker::zeek::visit_as_message([this, topic_str](auto& msg) { ProcessMessage(topic_str, msg); }, - std::move(message)); + broker::zeek::visit_as_message([this, topic_str](auto& msg) { ProcessMessage(topic_str, msg); }, message); } catch ( std::runtime_error& e ) { reporter->Warning("ignoring invalid Broker message: %s", +e.what()); continue;