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

36
DiscImageChef.Filesystems/LisaFS/File.cs
View File

@@ -208,18 +208,17 @@ namespace DiscImageChef.Filesystems.LisaFS
{
DecodeTag(device.ReadSectorTag(i, SectorTagType.AppleSectorTag), out sysTag);
if(sysTag.fileID == fileId)
{
byte[] sector;
if(sysTag.fileID != fileId) continue;
if(!tags) sector = device.ReadSector(i);
else sector = device.ReadSectorTag(i, SectorTagType.AppleSectorTag);
byte[] sector;
// Relative block for $Loader starts at $Boot block
if(sysTag.fileID == FILEID_LOADER_SIGNED) sysTag.relPage--;
if(!tags) sector = device.ReadSector(i);
else sector = device.ReadSectorTag(i, SectorTagType.AppleSectorTag);
Array.Copy(sector, 0, buf, sector.Length * sysTag.relPage, sector.Length);
}
// Relative block for $Loader starts at $Boot block
if(sysTag.fileID == FILEID_LOADER_SIGNED) sysTag.relPage--;
Array.Copy(sector, 0, buf, sector.Length * sysTag.relPage, sector.Length);
}
if(!tags) systemFileCache.Add(fileId, buf);
@@ -445,18 +444,17 @@ namespace DiscImageChef.Filesystems.LisaFS
string filename = StringHandlers.CToString(entry.filename, CurrentEncoding);
// LisaOS is case insensitive
if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) == 0 &&
entry.parentID == fileId)
{
fileId = entry.fileID;
isDir = entry.fileType == 0x01;
if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 ||
entry.parentID != fileId) continue;
// Not last path element, and it's not a directory
if(lvl != pathElements.Length - 1 && !isDir) return Errno.NotDirectory;
fileId = entry.fileID;
isDir = entry.fileType == 0x01;
// Arrived last path element
if(lvl == pathElements.Length - 1) return Errno.NoError;
}
// Not last path element, and it's not a directory
if(lvl != pathElements.Length - 1 && !isDir) return Errno.NotDirectory;
// Arrived last path element
if(lvl == pathElements.Length - 1) return Errno.NoError;
}
}