aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-05-18 18:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all redundant else keywords.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-04 08:45:42 +01:00
parent 8b9d4408ea
commit 364476bdf1
4 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: 2a93125433...79fd67ba55

95
Aaru.Filesystems/LisaFS/File.cs
View File

@@ -274,13 +274,11 @@ public sealed partial class LisaFS
return ErrorNumber.NoError;
}
else
{
errno = _device.ReadSectorsTag(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
SectorTagType.AppleSectorTag, out buf);
return errno != ErrorNumber.NoError ? errno : ErrorNumber.NoError;
}
errno = _device.ReadSectorsTag(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
SectorTagType.AppleSectorTag, out buf);
return errno != ErrorNumber.NoError ? errno : ErrorNumber.NoError;
}
LisaTag.PriamTag sysTag;
@@ -354,57 +352,54 @@ public sealed partial class LisaFS
if(!_debug ||
fileId == 0)
return ErrorNumber.NoSuchFile;
else
stat = new FileEntryInfo();
error = GetAttributes(fileId, out FileAttributes attrs);
stat.Attributes = attrs;
if(error != ErrorNumber.NoError)
return error;
if(fileId < 0 &&
fileId != FILEID_BOOT_SIGNED &&
fileId != FILEID_LOADER_SIGNED)
{
stat = new FileEntryInfo();
error = GetAttributes(fileId, out FileAttributes attrs);
stat.Attributes = attrs;
error = ReadExtentsFile((short)(fileId * -1), out file);
if(error != ErrorNumber.NoError)
return error;
if(fileId < 0 &&
fileId != FILEID_BOOT_SIGNED &&
fileId != FILEID_LOADER_SIGNED)
{
error = ReadExtentsFile((short)(fileId * -1), out file);
stat.CreationTime = DateHandlers.LisaToDateTime(file.dtc);
stat.AccessTime = DateHandlers.LisaToDateTime(file.dta);
stat.BackupTime = DateHandlers.LisaToDateTime(file.dtb);
stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
if(error != ErrorNumber.NoError)
return error;
stat.CreationTime = DateHandlers.LisaToDateTime(file.dtc);
stat.AccessTime = DateHandlers.LisaToDateTime(file.dta);
stat.BackupTime = DateHandlers.LisaToDateTime(file.dtb);
stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
stat.Inode = (ulong)fileId;
stat.Links = 0;
stat.Length = _mddf.datasize;
stat.BlockSize = _mddf.datasize;
stat.Blocks = 1;
}
else
{
error = ReadSystemFile(fileId, out byte[] buf);
if(error != ErrorNumber.NoError)
return error;
stat.CreationTime = fileId != 4 ? _mddf.dtvc : _mddf.dtcc;
stat.BackupTime = _mddf.dtvb;
stat.Inode = (ulong)fileId;
stat.Links = 0;
stat.Length = buf.Length;
stat.BlockSize = _mddf.datasize;
stat.Blocks = buf.Length / _mddf.datasize;
}
return ErrorNumber.NoError;
stat.Inode = (ulong)fileId;
stat.Links = 0;
stat.Length = _mddf.datasize;
stat.BlockSize = _mddf.datasize;
stat.Blocks = 1;
}
else
{
error = ReadSystemFile(fileId, out byte[] buf);
if(error != ErrorNumber.NoError)
return error;
stat.CreationTime = fileId != 4 ? _mddf.dtvc : _mddf.dtcc;
stat.BackupTime = _mddf.dtvb;
stat.Inode = (ulong)fileId;
stat.Links = 0;
stat.Length = buf.Length;
stat.BlockSize = _mddf.datasize;
stat.Blocks = buf.Length / _mddf.datasize;
}
return ErrorNumber.NoError;
}
stat = new FileEntryInfo();

42
Aaru.Images/CloneCD/Read.cs
View File

@@ -752,37 +752,35 @@ public sealed partial class CloneCd
break;
}
else
{
tmpTrack.BytesPerSector = 2048;
tmpTrack.Type = TrackType.CdMode2Form1;
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
tmpTrack.BytesPerSector = 2048;
tmpTrack.Type = TrackType.CdMode2Form1;
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
if(_imageInfo.SectorSize < 2048)
_imageInfo.SectorSize = 2048;
if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
_imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
break;
}
if(_imageInfo.SectorSize < 2048)
_imageInfo.SectorSize = 2048;
break;
}
tmpTrack.BytesPerSector = 2336;

13
Aaru.Images/KryoFlux/Read.cs
View File

@@ -116,7 +116,8 @@ public sealed partial class KryoFlux
continue;
}
else if(cylinder == 1)
if(cylinder == 1)
{
AaruConsole.DebugWriteLine(MODULE_NAME,
Localization.Cannot_find_cyl_1_supposing_double_stepping);
@@ -125,13 +126,11 @@ public sealed partial class KryoFlux
continue;
}
else
{
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Arrived_end_of_disk_at_cylinder_0,
cylinder);
break;
}
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Arrived_end_of_disk_at_cylinder_0,
cylinder);
break;
}
var trackFilter = new ZZZNoFilter();