From 2abc82722fe4c50939534de72a6dc87483bac2bd Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 15 Aug 2022 09:45:46 -0700
Subject: [PATCH] Fix a swath of AUTO_CAUSES_COPY issues reported by Coverity

---
 src/Stmt.cc                         | 4 ++--
 src/analyzer/protocol/asn1/asn1.pac | 2 +-
 src/logging/WriterBackend.cc        | 2 +-
 src/script_opt/CPP/Driver.cc        | 4 ++--
 src/script_opt/Stmt.cc              | 2 +-
 src/script_opt/UseDefs.cc           | 2 +-
 src/script_opt/ZAM/Driver.cc        | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Stmt.cc b/src/Stmt.cc
index 9dfd7ea1f4..0d5a47afaf 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -883,7 +883,7 @@ bool SwitchStmt::AddCaseLabelValueMapping(const Val* v, int idx)
 
 bool SwitchStmt::AddCaseLabelTypeMapping(ID* t, int idx)
 	{
-	for ( auto i : case_label_type_list )
+	for ( const auto& i : case_label_type_list )
 		{
 		if ( same_type(i.first->GetType(), t->GetType()) )
 			return false;
@@ -918,7 +918,7 @@ std::pair<int, ID*> SwitchStmt::FindCaseLabelMatch(const Val* v) const
 		}
 
 	// Find matching type cases.
-	for ( auto i : case_label_type_list )
+	for ( const auto& i : case_label_type_list )
 		{
 		auto id = i.first;
 		const auto& type = id->GetType();
diff --git a/src/analyzer/protocol/asn1/asn1.pac b/src/analyzer/protocol/asn1/asn1.pac
index c949c97972..7046938ee3 100644
--- a/src/analyzer/protocol/asn1/asn1.pac
+++ b/src/analyzer/protocol/asn1/asn1.pac
@@ -161,7 +161,7 @@ zeek::StringValPtr asn1_oid_to_val(const ASN1Encoding* oid)
 		// Underflow.
 		return zeek::val_mgr->EmptyString();
 
-	for ( auto subidentifier : subidentifiers )
+	for ( const auto& subidentifier : subidentifiers )
 		{
 		uint64 value = 0;
 
diff --git a/src/logging/WriterBackend.cc b/src/logging/WriterBackend.cc
index e0aae0db8f..c399ec528b 100644
--- a/src/logging/WriterBackend.cc
+++ b/src/logging/WriterBackend.cc
@@ -120,7 +120,7 @@ bool WriterBackend::WriterInfo::FromBroker(broker::data d)
 	rotation_interval = *brotation_interval;
 	network_time = *bnetwork_time;
 
-	for ( auto i : *bconfig )
+	for ( const auto& i : *bconfig )
 		{
 		auto k = broker::get_if<std::string>(&i.first);
 		auto v = broker::get_if<std::string>(&i.second);
diff --git a/src/script_opt/CPP/Driver.cc b/src/script_opt/CPP/Driver.cc
index 9faceac98c..76dfde55bf 100644
--- a/src/script_opt/CPP/Driver.cc
+++ b/src/script_opt/CPP/Driver.cc
@@ -314,7 +314,7 @@ void CPPCompile::GenEpilog()
 	GenCPPDynStmt();
 
 	NL();
-	for ( auto gi : all_global_info )
+	for ( const auto& gi : all_global_info )
 		gi->GenerateInitializers(this);
 
 	NL();
@@ -449,7 +449,7 @@ void CPPCompile::GenFinishInit()
 		max_cohort = std::max(max_cohort, gi->MaxCohort());
 
 	for ( auto c = 0; c <= max_cohort; ++c )
-		for ( auto gi : all_global_info )
+		for ( const auto& gi : all_global_info )
 			if ( gi->CohortSize(c) > 0 )
 				Emit("%s.InitializeCohort(&im, %s);", gi->InitializersName(), Fmt(c));
 
diff --git a/src/script_opt/Stmt.cc b/src/script_opt/Stmt.cc
index 8251e05c71..58521849d1 100644
--- a/src/script_opt/Stmt.cc
+++ b/src/script_opt/Stmt.cc
@@ -895,7 +895,7 @@ StmtPtr InitStmt::Duplicate()
 	// Need to duplicate the initializer list since later reductions
 	// can modify it in place.
 	std::vector<IDPtr> new_inits;
-	for ( auto id : inits )
+	for ( const auto& id : inits )
 		new_inits.push_back(id);
 
 	return SetSucc(new InitStmt(new_inits));
diff --git a/src/script_opt/UseDefs.cc b/src/script_opt/UseDefs.cc
index e80f38f6a3..8e54ab18b7 100644
--- a/src/script_opt/UseDefs.cc
+++ b/src/script_opt/UseDefs.cc
@@ -83,7 +83,7 @@ bool UseDefs::RemoveUnused(int iter)
 			const auto& inits = init->Inits();
 			std::vector<IDPtr> used_ids;
 
-			for ( auto id : inits )
+			for ( const auto& id : inits )
 				if ( is_atomic_type(id->GetType()) || ! CheckIfUnused(s, id.get(), false) )
 					used_ids.emplace_back(id);
 
diff --git a/src/script_opt/ZAM/Driver.cc b/src/script_opt/ZAM/Driver.cc
index 2cf6dd0461..18426909da 100644
--- a/src/script_opt/ZAM/Driver.cc
+++ b/src/script_opt/ZAM/Driver.cc
@@ -370,7 +370,7 @@ void ZAMCompiler::Dump()
 	if ( remapped_frame )
 		printf("Original frame for %s:\n", func->Name());
 
-	for ( auto elem : frame_layout1 )
+	for ( const auto& elem : frame_layout1 )
 		printf("frame[%d] = %s\n", elem.second, elem.first->Name());
 
 	if ( remapped_frame )