From 0b27e88da177c1d2da91b803ffe7179d13c07ffd Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Thu, 24 Feb 2022 23:46:10 -0500 Subject: [PATCH] Disk: WriteDriver: Fix parameter shadowing --- disk/diskwritedriver.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/disk/diskwritedriver.cpp b/disk/diskwritedriver.cpp index f5434ef..58b0fd9 100644 --- a/disk/diskwritedriver.cpp +++ b/disk/diskwritedriver.cpp @@ -50,11 +50,11 @@ optional WriteDriver::writeLogicalDisk(Communication& com, device_even t = APIEvent::Type::EOFReached; report(t, s); }; - auto amount = readDriver.readLogicalDisk(com, reportFromRead, currentBlock * idealBlockSize, + auto bytesTransferred = readDriver.readLogicalDisk(com, reportFromRead, currentBlock * idealBlockSize, atomicBuffer.data(), idealBlockSize, timeout); timeout -= std::chrono::duration_cast(std::chrono::high_resolution_clock::now() - start); - if(amount != idealBlockSize) + if(bytesTransferred != idealBlockSize) break; // readLogicalDisk reports its own errors const bool useAlignedWriteBuffer = (posWithinCurrentBlock != 0 || curAmt != idealBlockSize); @@ -64,28 +64,28 @@ optional WriteDriver::writeLogicalDisk(Communication& com, device_even } start = std::chrono::high_resolution_clock::now(); - amount = writeLogicalDiskAligned(com, report, currentBlock * idealBlockSize, atomicBuffer.data(), + bytesTransferred = writeLogicalDiskAligned(com, report, currentBlock * idealBlockSize, atomicBuffer.data(), useAlignedWriteBuffer ? alignedWriteBuffer.data() : (from + fromOffset), idealBlockSize, timeout); timeout -= std::chrono::duration_cast(std::chrono::high_resolution_clock::now() - start); - if(amount == RetryAtomic) { + if(bytesTransferred == RetryAtomic) { // The user may want to log these events in order to see how many atomic misses they are getting report(APIEvent::Type::AtomicOperationRetried, APIEvent::Severity::EventInfo); continue; } - if(!amount.has_value() || *amount < curAmt) { + if(!bytesTransferred.has_value() || *bytesTransferred < curAmt) { if(timeout < std::chrono::milliseconds::zero()) report(APIEvent::Type::Timeout, APIEvent::Severity::Error); else - report((blocksProcessed || amount.value_or(0u) != 0u) ? APIEvent::Type::EOFReached : + report((blocksProcessed || bytesTransferred.value_or(0u) != 0u) ? APIEvent::Type::EOFReached : APIEvent::Type::ParameterOutOfRange, APIEvent::Severity::Error); break; } if(!ret) ret.emplace(); - *ret += std::min(*amount, curAmt); + *ret += std::min(*bytesTransferred, curAmt); blocksProcessed++; }