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 IMediaImage.ReadSector(s) to return error status instead of buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-19 21:16:47 +01:00
parent fbccfb2ca9
commit f51d414abd
187 changed files with 4036 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Aaru.Filesystems/UCSDPascal/Super.cs
View File

@@ -64,7 +64,10 @@ namespace Aaru.Filesystems.UCSDPascal
_multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
// Blocks 0 and 1 are boot code
_catalogBlocks = _device.ReadSectors(_multiplier * 2, _multiplier);
ErrorNumber errno = _device.ReadSectors(_multiplier * 2, _multiplier, out _catalogBlocks);
if(errno != ErrorNumber.NoError)
return errno;
// On Apple //, it's little endian
// TODO: Fix
@@ -93,9 +96,12 @@ namespace Aaru.Filesystems.UCSDPascal
_mountedVolEntry.Files < 0)
return ErrorNumber.InvalidArgument;
_catalogBlocks = _device.ReadSectors(_multiplier * 2,
(uint)(_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock - 2) *
_multiplier);
errno = _device.ReadSectors(_multiplier * 2,
(uint)(_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock - 2) *
_multiplier, out _catalogBlocks);
if(errno != ErrorNumber.NoError)
return errno;
int offset = 26;
@@ -122,7 +128,10 @@ namespace Aaru.Filesystems.UCSDPascal
offset += 26;
}
_bootBlocks = _device.ReadSectors(0, 2 * _multiplier);
errno = _device.ReadSectors(0, 2 * _multiplier, out _bootBlocks);
if(errno != ErrorNumber.NoError)
return errno;
XmlFsType = new FileSystemType
{