Fix -Wredundant-move warnings

jschmidt-icinga · jschmidt-icinga · commit 0cb7f768d98f · 2025-11-17T16:57:20.000+01:00
diff --git a/lib/base/object-packer.cpp b/lib/base/object-packer.cpp
@@ -239,8 +239,8 @@ static void PackAny(const Value& value, std::string& builder)
  */
 String icinga::PackObject(const Value& value)
 {
-	std::string builder;
-	PackAny(value, builder);
+	String builder;
+	PackAny(value, builder.GetData());
 
 	return builder;
 }
diff --git a/lib/icinga/checkable-dependency.cpp b/lib/icinga/checkable-dependency.cpp
@@ -51,7 +51,7 @@ std::vector<DependencyGroup::Ptr> Checkable::GetDependencyGroups() const
 static std::variant<Checkable*, String> GetDependencyGroupKey(const Dependency::Ptr& dependency)
 {
 	if (auto redundancyGroup(dependency->GetRedundancyGroup()); !redundancyGroup.IsEmpty()) {
-		return std::move(redundancyGroup);
+		return redundancyGroup;
 	}
 
 	return dependency->GetParent().get();

Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,8 @@ static void PackAny(const Value& value, std::string& builder)`
`239`	`239`	`*/`
`240`	`240`	`String icinga::PackObject(const Value& value)`
`241`	`241`	`{`
`242`		`- std::string builder;`
`243`		`- PackAny(value, builder);`
	`242`	`+ String builder;`
	`243`	`+ PackAny(value, builder.GetData());`
`244`	`244`
`245`	`245`	`return builder;`
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ std::vector<DependencyGroup::Ptr> Checkable::GetDependencyGroups() const`
`51`	`51`	`static std::variant<Checkable*, String> GetDependencyGroupKey(const Dependency::Ptr& dependency)`
`52`	`52`	`{`
`53`	`53`	`if (auto redundancyGroup(dependency->GetRedundancyGroup()); !redundancyGroup.IsEmpty()) {`
`54`		`- return std::move(redundancyGroup);`
	`54`	`+ return redundancyGroup;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`return dependency->GetParent().get();`