simplify lambda captures

1 files changed, 9 insertions, 11 deletions

diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp
index c6115024b..e0f84e044 100644
--- a/zenstore/compactcas.cpp
+++ b/zenstore/compactcas.cpp
@@ -344,7 +344,7 @@ CasContainerStrategy::Scrub(ScrubContext& Ctx)
 
 	m_BlockStore.IterateChunks(
 		ChunkLocations,
-		[&ChunkIndexToChunkHash, &BadKeys](size_t ChunkIndex, const void* Data, uint64_t Size) {
+		[&](size_t ChunkIndex, const void* Data, uint64_t Size) {
 			const IoHash  ComputedHash = IoHash::HashBuffer(Data, Size);
 			const IoHash& ExpectedHash = ChunkIndexToChunkHash[ChunkIndex];
 			if (ComputedHash != ExpectedHash)
@@ -353,7 +353,7 @@ CasContainerStrategy::Scrub(ScrubContext& Ctx)
 				BadKeys.push_back(ExpectedHash);
 			}
 		},
-		[&ChunkIndexToChunkHash, &BadKeys](size_t ChunkIndex, BasicFile& BlockFile, uint64_t Offset, uint64_t Size) {
+		[&](size_t ChunkIndex, BasicFile& BlockFile, uint64_t Offset, uint64_t Size) {
 			IoHashStream Hasher;
 			BlockFile.StreamByteRange(Offset, Size, [&](const void* Data, uint64_t Size) { Hasher.Append(Data, Size); });
 			IoHash		  ComputedHash = Hasher.GetHash();
@@ -493,9 +493,7 @@ CasContainerStrategy::CollectGarbage(GcContext& GcCtx)
 		KeepChunkIndexes,
 		m_PayloadAlignment,
 		false,
-		[this, &DeletedChunks, &ChunkIndexToChunkHash, &LocationMap, &ReadBlockTimeUs, &ReadBlockLongestTimeUs](
-			const BlockStore::MovedChunksArray& MovedChunks,
-			const BlockStore::ChunkIndexArray&	RemovedChunks) {
+		[&](const BlockStore::MovedChunksArray& MovedChunks, const BlockStore::ChunkIndexArray& RemovedChunks) {
 			std::vector<CasDiskIndexEntry> LogEntries;
 			LogEntries.reserve(MovedChunks.size() + RemovedChunks.size());
 			for (const auto& Entry : MovedChunks)
@@ -518,7 +516,7 @@ CasContainerStrategy::CollectGarbage(GcContext& GcCtx)
 			{
 				RwLock::ExclusiveLockScope __(m_LocationMapLock);
 				Stopwatch				   Timer;
-				const auto				   ____ = MakeGuard([&Timer, &ReadBlockTimeUs, &ReadBlockLongestTimeUs] {
+				const auto				   ____ = MakeGuard([&] {
 					uint64_t ElapsedUs = Timer.GetElapsedTimeUs();
 					ReadBlockTimeUs += ElapsedUs;
 					ReadBlockLongestTimeUs = std::max(ElapsedUs, ReadBlockLongestTimeUs);
@@ -547,7 +545,7 @@ CasContainerStrategy::MakeIndexSnapshot()
 	ZEN_INFO("write store snapshot for '{}'", m_Config.RootDirectory / m_ContainerBaseName);
 	uint64_t   EntryCount = 0;
 	Stopwatch  Timer;
-	const auto _ = MakeGuard([this, &EntryCount, &Timer] {
+	const auto _ = MakeGuard([&] {
 		ZEN_INFO("wrote store snapshot for '{}' containing #{} entries in {}",
 				 m_Config.RootDirectory / m_ContainerBaseName,
 				 EntryCount,
@@ -632,7 +630,7 @@ CasContainerStrategy::ReadIndexFile()
 	if (std::filesystem::is_regular_file(IndexPath))
 	{
 		Stopwatch  Timer;
-		const auto _ = MakeGuard([this, &Entries, &Timer] {
+		const auto _ = MakeGuard([&] {
 			ZEN_INFO("read store '{}' index containing #{} entries in {}",
 					 m_Config.RootDirectory / m_ContainerBaseName,
 					 Entries.size(),
@@ -685,7 +683,7 @@ CasContainerStrategy::ReadLog(uint64_t SkipEntryCount)
 	if (std::filesystem::is_regular_file(LogPath))
 	{
 		Stopwatch  Timer;
-		const auto _ = MakeGuard([this, &Entries, &Timer] {
+		const auto _ = MakeGuard([&] {
 			ZEN_INFO("read store '{}' log containing #{} entries in {}",
 					 m_Config.RootDirectory / m_ContainerBaseName,
 					 Entries.size(),
@@ -745,7 +743,7 @@ CasContainerStrategy::MigrateLegacyData(bool CleanSource)
 	uint32_t   MigratedBlockCount = 0;
 	Stopwatch  MigrationTimer;
 	uint64_t   TotalSize = 0;
-	const auto _		 = MakeGuard([this, &MigrationTimer, &MigratedChunkCount, &MigratedBlockCount, &TotalSize] {
+	const auto _		 = MakeGuard([&] {
 		ZEN_INFO("migrated store '{}' to #{} chunks in #{} blocks in {} ({})",
 				 m_Config.RootDirectory / m_ContainerBaseName,
 				 MigratedChunkCount,
@@ -768,7 +766,7 @@ CasContainerStrategy::MigrateLegacyData(bool CleanSource)
 	LegacyCasLog.Open(LegacyLogPath, CleanSource ? CasLogFile::Mode::kWrite : CasLogFile::Mode::kRead);
 	{
 		Stopwatch  Timer;
-		const auto __ = MakeGuard([this, &LegacyDiskIndex, &Timer] {
+		const auto __ = MakeGuard([&] {
 			ZEN_INFO("read store '{}' legacy log containing #{} entries in {}",
 					 m_Config.RootDirectory / m_ContainerBaseName,
 					 LegacyDiskIndex.size(),