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

35
DiscImageChef.Core/Devices/ReaderATA.cs
View File

@@ -86,13 +86,14 @@ namespace DiscImageChef.Core.Devices
blocks = (ulong)(cylinders * heads * sectors);
}
if((ataId.CurrentCylinders == 0 || ataId.CurrentHeads == 0 || ataId.CurrentSectorsPerTrack == 0) && ataId.Cylinders > 0 && ataId.Heads > 0 && ataId.SectorsPerTrack > 0)
{
cylinders = ataId.Cylinders;
heads = (byte)ataId.Heads;
sectors = (byte)ataId.SectorsPerTrack;
blocks = (ulong)(cylinders * heads * sectors);
}
if((ataId.CurrentCylinders != 0 && ataId.CurrentHeads != 0 && ataId.CurrentSectorsPerTrack != 0) ||
ataId.Cylinders <= 0 || ataId.Heads <= 0 ||
ataId.SectorsPerTrack <= 0) return (cylinders, heads, sectors);
cylinders = ataId.Cylinders;
heads = (byte)ataId.Heads;
sectors = (byte)ataId.SectorsPerTrack;
blocks = (ulong)(cylinders * heads * sectors);
return (cylinders, heads, sectors);
}
@@ -107,11 +108,10 @@ namespace DiscImageChef.Core.Devices
lbaMode = true;
}
if(ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
{
blocks = ataId.LBA48Sectors;
lbaMode = true;
}
if(!ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48)) return blocks;
blocks = ataId.LBA48Sectors;
lbaMode = true;
return blocks;
}
@@ -279,14 +279,11 @@ namespace DiscImageChef.Core.Devices
if(!error || blocksToRead == 1) break;
}
if(error && lbaMode)
{
blocksToRead = 1;
errorMessage = string.Format("Device error {0} trying to guess ideal transfer length.", dev.LastError);
return true;
}
if(!error || !lbaMode) return false;
return false;
blocksToRead = 1;
errorMessage = string.Format("Device error {0} trying to guess ideal transfer length.", dev.LastError);
return true;
}
bool AtaReadBlocks(out byte[] buffer, ulong block, uint count, out double duration)