Convert if to switch statement.

This commit is contained in:
2022-11-13 19:38:03 +00:00
parent 98d7ac3349
commit c5b34ee3d9
65 changed files with 2602 additions and 2126 deletions

View File

@@ -156,18 +156,33 @@ public sealed partial class MediaScan
if(!error)
{
if(duration >= 500)
results.F += blocksToRead;
else if(duration >= 150)
results.E += blocksToRead;
else if(duration >= 50)
results.D += blocksToRead;
else if(duration >= 10)
results.C += blocksToRead;
else if(duration >= 3)
results.B += blocksToRead;
else
results.A += blocksToRead;
switch(duration)
{
case >= 500:
results.F += blocksToRead;
break;
case >= 150:
results.E += blocksToRead;
break;
case >= 50:
results.D += blocksToRead;
break;
case >= 10:
results.C += blocksToRead;
break;
case >= 3:
results.B += blocksToRead;
break;
default:
results.A += blocksToRead;
break;
}
ScanTime?.Invoke(i, duration);
mhddLog.Write(i, duration);
@@ -265,25 +280,40 @@ public sealed partial class MediaScan
currentSpeed > 0)
results.MinSpeed = currentSpeed;
PulseProgress?.
Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
PulseProgress?.Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed
:F3} MiB/sec.)");
bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out _);
if(!error)
{
if(duration >= 500)
results.F += blocksToRead;
else if(duration >= 150)
results.E += blocksToRead;
else if(duration >= 50)
results.D += blocksToRead;
else if(duration >= 10)
results.C += blocksToRead;
else if(duration >= 3)
results.B += blocksToRead;
else
results.A += blocksToRead;
switch(duration)
{
case >= 500:
results.F += blocksToRead;
break;
case >= 150:
results.E += blocksToRead;
break;
case >= 50:
results.D += blocksToRead;
break;
case >= 10:
results.C += blocksToRead;
break;
case >= 3:
results.B += blocksToRead;
break;
default:
results.A += blocksToRead;
break;
}
ScanTime?.Invoke(currentBlock, duration);
mhddLog.Write(currentBlock, duration);