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

66
DiscImageChef.Partitions/PC98.cs
View File

@@ -86,43 +86,41 @@ namespace DiscImageChef.Partitions
DicConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"",
StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
if(entry.dp_scyl != entry.dp_ecyl && entry.dp_ecyl > 0 &&
entry.dp_scyl <= imagePlugin.ImageInfo.Cylinders &&
entry.dp_ecyl <= imagePlugin.ImageInfo.Cylinders && entry.dp_shd <= imagePlugin.ImageInfo.Heads &&
entry.dp_ehd <= imagePlugin.ImageInfo.Heads &&
entry.dp_ssect <= imagePlugin.ImageInfo.SectorsPerTrack &&
entry.dp_esect <= imagePlugin.ImageInfo.SectorsPerTrack)
if(entry.dp_scyl == entry.dp_ecyl || entry.dp_ecyl <= 0 ||
entry.dp_scyl > imagePlugin.ImageInfo.Cylinders || entry.dp_ecyl > imagePlugin.ImageInfo.Cylinders ||
entry.dp_shd > imagePlugin.ImageInfo.Heads || entry.dp_ehd > imagePlugin.ImageInfo.Heads ||
entry.dp_ssect > imagePlugin.ImageInfo.SectorsPerTrack ||
entry.dp_esect > imagePlugin.ImageInfo.SectorsPerTrack) continue;
Partition part = new Partition
{
Partition part = new Partition
{
Start = Helpers.CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1),
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack),
Type = DecodePC98Sid(entry.dp_sid),
Name = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
Sequence = counter,
Scheme = Name
};
part.Offset = part.Start * imagePlugin.GetSectorSize();
part.Length = Helpers.CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1),
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - part.Start;
part.Size = part.Length * imagePlugin.GetSectorSize();
Start = Helpers.CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1),
imagePlugin.ImageInfo.Heads, imagePlugin.ImageInfo.SectorsPerTrack),
Type = DecodePC98Sid(entry.dp_sid),
Name = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
Sequence = counter,
Scheme = Name
};
part.Offset = part.Start * imagePlugin.GetSectorSize();
part.Length = Helpers.CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1),
imagePlugin.ImageInfo.Heads,
imagePlugin.ImageInfo.SectorsPerTrack) - part.Start;
part.Size = part.Length * imagePlugin.GetSectorSize();
DicConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
DicConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}", part.Type);
DicConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}", part.Name);
DicConsole.DebugWriteLine("PC98 plugin", "part.Sequence = {0}", part.Sequence);
DicConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}", part.Offset);
DicConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
DicConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
DicConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}", part.Type);
DicConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}", part.Name);
DicConsole.DebugWriteLine("PC98 plugin", "part.Sequence = {0}", part.Sequence);
DicConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}", part.Offset);
DicConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
DicConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
if(((entry.dp_mid & 0x20) == 0x20 || (entry.dp_mid & 0x44) == 0x44) &&
part.Start < imagePlugin.ImageInfo.Sectors && part.End <= imagePlugin.ImageInfo.Sectors)
{
partitions.Add(part);
counter++;
}
}
if(((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44) ||
part.Start >= imagePlugin.ImageInfo.Sectors ||
part.End > imagePlugin.ImageInfo.Sectors) continue;
partitions.Add(part);
counter++;
}
return partitions.Count > 0;