From ef5b169acd537bde61dd9fa753deee92ba7e616f Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 27 Nov 2023 11:41:48 -0700 Subject: [PATCH] Add some uses of std::move in constructors and simple functions for pass-by-value arguments --- src/EventTrace.h | 4 ++-- src/Expr.cc | 2 +- src/Val.h | 2 +- src/iosource/Packet.h | 2 +- src/packet_analysis/Component.cc | 5 ++--- src/packet_analysis/protocol/ip/IPBasedAnalyzer.cc | 4 +++- src/packet_analysis/protocol/iptunnel/IPTunnel.cc | 2 +- src/script_opt/IDOptInfo.h | 4 ++-- src/script_opt/ScriptOpt.h | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/EventTrace.h b/src/EventTrace.h index de111de8f6..8d391a01df 100644 --- a/src/EventTrace.h +++ b/src/EventTrace.h @@ -151,7 +151,7 @@ public: // delete values. class DeltaSetSetEntry : public ValDelta { public: - DeltaSetSetEntry(const ValTrace* _vt, ValPtr _index) : ValDelta(_vt), index(_index) {} + DeltaSetSetEntry(const ValTrace* _vt, ValPtr _index) : ValDelta(_vt), index(std::move(_index)) {} std::string Generate(ValTraceMgr* vtm) const override; bool NeedsLHS() const override { return false; } @@ -166,7 +166,7 @@ private: class DeltaSetTableEntry : public ValDelta { public: DeltaSetTableEntry(const ValTrace* _vt, ValPtr _index, ValPtr _new_val) - : ValDelta(_vt), index(_index), new_val(std::move(_new_val)) {} + : ValDelta(_vt), index(std::move(_index)), new_val(std::move(_new_val)) {} std::string Generate(ValTraceMgr* vtm) const override; diff --git a/src/Expr.cc b/src/Expr.cc index 8153bf7d3f..ed78f9750f 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -3057,7 +3057,7 @@ ListExprPtr expand_op(ListExprPtr op, const TypePtr& t) { TableConstructorExpr::TableConstructorExpr(ListExprPtr constructor_list, std::unique_ptr> arg_attrs, TypePtr arg_type, AttributesPtr arg_attrs2) - : UnaryExpr(EXPR_TABLE_CONSTRUCTOR, expand_op(constructor_list, arg_type)) { + : UnaryExpr(EXPR_TABLE_CONSTRUCTOR, expand_op(std::move(constructor_list), arg_type)) { if ( IsError() ) return; diff --git a/src/Val.h b/src/Val.h index 96bc5a037a..d50acdafc7 100644 --- a/src/Val.h +++ b/src/Val.h @@ -1563,7 +1563,7 @@ public: * @return True if the element was inserted or false if the element was * the wrong type. */ - bool Append(ValPtr element) { return Insert(Size(), element); } + bool Append(ValPtr element) { return Insert(Size(), std::move(element)); } // Removes an element at a specific position. bool Remove(unsigned int index); diff --git a/src/iosource/Packet.h b/src/iosource/Packet.h index 6744400c85..0a6314618b 100644 --- a/src/iosource/Packet.h +++ b/src/iosource/Packet.h @@ -74,7 +74,7 @@ public: */ Packet(int link_type, pkt_timeval* ts, uint32_t caplen, uint32_t len, const u_char* data, bool copy = false, std::string tag = "") { - Init(link_type, ts, caplen, len, data, copy, tag); + Init(link_type, ts, caplen, len, data, copy, std::move(tag)); } /** diff --git a/src/packet_analysis/Component.cc b/src/packet_analysis/Component.cc index 663184b7e5..d0c21b0262 100644 --- a/src/packet_analysis/Component.cc +++ b/src/packet_analysis/Component.cc @@ -9,9 +9,8 @@ using namespace zeek::packet_analysis; Component::Component(const std::string& name, factory_callback arg_factory, Tag::subtype_t arg_subtype) - : plugin::Component(plugin::component::PACKET_ANALYZER, name, arg_subtype, packet_mgr->GetTagType()) { - factory = arg_factory; -} + : plugin::Component(plugin::component::PACKET_ANALYZER, name, arg_subtype, packet_mgr->GetTagType()), + factory(std::move(arg_factory)) {} void Component::Initialize() { InitializeTag(); diff --git a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.cc b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.cc index 397235c668..9b24807efb 100644 --- a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.cc +++ b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.cc @@ -263,7 +263,9 @@ void IPBasedAnalyzer::DumpPortDebug() { TableValPtr IPBasedAnalyzer::ignore_checksums_nets_table = nullptr; -void IPBasedAnalyzer::SetIgnoreChecksumsNets(TableValPtr t) { IPBasedAnalyzer::ignore_checksums_nets_table = t; } +void IPBasedAnalyzer::SetIgnoreChecksumsNets(TableValPtr t) { + IPBasedAnalyzer::ignore_checksums_nets_table = std::move(t); +} TableValPtr IPBasedAnalyzer::GetIgnoreChecksumsNets() { if ( ! IPBasedAnalyzer::ignore_checksums_nets_table ) diff --git a/src/packet_analysis/protocol/iptunnel/IPTunnel.cc b/src/packet_analysis/protocol/iptunnel/IPTunnel.cc index 1ab225f0e9..e7ac1b3cc1 100644 --- a/src/packet_analysis/protocol/iptunnel/IPTunnel.cc +++ b/src/packet_analysis/protocol/iptunnel/IPTunnel.cc @@ -185,7 +185,7 @@ namespace detail { IPTunnelTimer::IPTunnelTimer(double t, IPTunnelAnalyzer::IPPair p, IPTunnelAnalyzer* analyzer) : Timer(t + BifConst::Tunnel::ip_tunnel_timeout, zeek::detail::TIMER_IP_TUNNEL_INACTIVITY), - tunnel_idx(p), + tunnel_idx(std::move(p)), analyzer(analyzer) {} void IPTunnelTimer::Dispatch(double t, bool is_expire) { diff --git a/src/script_opt/IDOptInfo.h b/src/script_opt/IDOptInfo.h index d579dd90ac..5dd07c85e2 100644 --- a/src/script_opt/IDOptInfo.h +++ b/src/script_opt/IDOptInfo.h @@ -71,7 +71,7 @@ public: // but not have an associated expression, if the point-of-definition // is the end of a confluence block. const ExprPtr& DefExprAfter() const { return def_expr; } - void SetDefExpr(ExprPtr e) { def_expr = e; } + void SetDefExpr(ExprPtr e) { def_expr = std::move(e); } // Used for debugging. void Dump() const; @@ -107,7 +107,7 @@ protected: class IDInitInfo { public: - IDInitInfo(const ID* _id, ExprPtr _init, InitClass _ic) : id(_id), init(_init), ic(_ic) {} + IDInitInfo(const ID* _id, ExprPtr _init, InitClass _ic) : id(_id), init(std::move(_init)), ic(_ic) {} const ID* Id() const { return id; } const ExprPtr& Init() const { return init; } diff --git a/src/script_opt/ScriptOpt.h b/src/script_opt/ScriptOpt.h index 1176990da2..3ca5636492 100644 --- a/src/script_opt/ScriptOpt.h +++ b/src/script_opt/ScriptOpt.h @@ -172,8 +172,8 @@ protected: class CoalescedScriptFunc : public ScriptFunc { public: CoalescedScriptFunc(StmtPtr merged_body, ScopePtr scope, ScriptFuncPtr orig_func) - : ScriptFunc(orig_func->Name(), orig_func->GetType(), {merged_body}, {0}), orig_func(orig_func) { - SetScope(scope); + : ScriptFunc(orig_func->Name(), orig_func->GetType(), {std::move(merged_body)}, {0}), orig_func(orig_func) { + SetScope(std::move(scope)); }; ValPtr Invoke(zeek::Args* args, Frame* parent) const override {