aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Invert 'if' statement to reduce nesting.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 06:06:19 +00:00
parent 9cd1869d1d
commit 4d886dae25
138 changed files with 9447 additions and 9806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
DiscImageChef.Core/Devices/ReaderSCSI.cs
View File

@@ -174,13 +174,12 @@ namespace DiscImageChef.Core.Devices
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize,
timeout, out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
longBlockSize = testSize;
readRaw = true;
break;
}
if(testSense || dev.Error) continue;
readLong10 = true;
longBlockSize = testSize;
readRaw = true;
break;
}
else if(blockSize == 1024)
foreach(ushort testSize in new[]
@@ -203,13 +202,12 @@ namespace DiscImageChef.Core.Devices
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, testSize,
timeout, out duration);
if(!testSense && !dev.Error)
{
readLong10 = true;
longBlockSize = testSize;
readRaw = true;
break;
}
if(testSense || dev.Error) continue;
readLong10 = true;
longBlockSize = testSize;
readRaw = true;
break;
}
else if(blockSize == 2048)
{
@@ -468,14 +466,11 @@ namespace DiscImageChef.Core.Devices
if(!dev.Error || blocksToRead == 1) break;
}
if(dev.Error)
{
blocksToRead = 1;
errorMessage = string.Format("Device error {0} trying to guess ideal transfer length.", dev.LastError);
return true;
}
if(!dev.Error) return false;
return false;
blocksToRead = 1;
errorMessage = string.Format("Device error {0} trying to guess ideal transfer length.", dev.LastError);
return true;
}
bool ScsiReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)
@@ -522,14 +517,11 @@ namespace DiscImageChef.Core.Devices
else return true;
}
if(sense || dev.Error)
{
DicConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}",
Decoders.SCSI.Sense.PrettifySense(senseBuf));
return true;
}
if(!sense && !dev.Error) return false;
return false;
DicConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}",
Decoders.SCSI.Sense.PrettifySense(senseBuf));
return true;
}
bool ScsiSeek(ulong block, out double duration)