cleanup

1 files changed, 8 insertions, 8 deletions

diff --git a/zenstore/blockstore.cpp b/zenstore/blockstore.cpp
index 559dfc1ee..9961e734d 100644
--- a/zenstore/blockstore.cpp
+++ b/zenstore/blockstore.cpp
@@ -194,7 +194,7 @@ BlockStore::Initialize(const std::filesystem::path&			  BlocksBasePath,
 }
 
 void
-BlockStore::WriteChunk(const void* Data, uint64_t Size, uint64_t Alignment, WriteCompleteCallback Callback)
+BlockStore::WriteChunk(const void* Data, uint64_t Size, uint64_t Alignment, WriteChunkCallback Callback)
 {
 	RwLock::ExclusiveLockScope InsertLock(m_InsertLock);
 
@@ -584,9 +584,9 @@ BlockStore::ReclaimSpace(const ReclaimSnapshotState&			Snapshot,
 }
 
 void
-BlockStore::IterateChunks(const std::vector<BlockStoreLocation>&													   ChunkLocations,
-						  std::function<void(size_t ChunkIndex, const void* Data, uint64_t Size)>					   SmallChunkCallback,
-						  std::function<void(size_t ChunkIndex, BasicFile& BlockFile, uint64_t Offset, uint64_t Size)> LargeChunkCallback)
+BlockStore::IterateChunks(const std::vector<BlockStoreLocation>& ChunkLocations,
+						  IterateChunksSmallSizeCallback		 SmallSizeCallback,
+						  IterateChunksLargeSizeCallback		 LargeSizeCallback)
 {
 	// We do a read sweep through the payloads file and validate
 	// any entries that are contained within each segment, with
@@ -637,9 +637,9 @@ BlockStore::IterateChunks(const std::vector<BlockStoreLocation>&
 							continue;
 						}
 
-						SmallChunkCallback(ChunkIndex,
-										   reinterpret_cast<uint8_t*>(BufferBase) + Location.Offset - WindowStart,
-										   Location.Size);
+						SmallSizeCallback(ChunkIndex,
+										  reinterpret_cast<uint8_t*>(BufferBase) + Location.Offset - WindowStart,
+										  Location.Size);
 					}
 				}
 
@@ -654,7 +654,7 @@ BlockStore::IterateChunks(const std::vector<BlockStoreLocation>&
 		{
 			const BlockStoreLocation Location  = ChunkLocations[ChunkIndex];
 			BasicFile&				 BlockFile = m_ChunkBlocks[Location.BlockIndex]->GetBasicFile();
-			LargeChunkCallback(ChunkIndex, BlockFile, Location.Offset, Location.Size);
+			LargeSizeCallback(ChunkIndex, BlockFile, Location.Offset, Location.Size);
 		}
 	}
 }