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)Long to return error status instead of buffer.

Browse Source
This commit is contained in:
Natalia Portillo
2021-09-20 14:22:22 +01:00
parent 88aeda7240
commit a6690aa121
77 changed files with 1048 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Aaru.Images/Alcohol120/Read.cs
View File

@@ -1373,14 +1373,17 @@ namespace Aaru.DiscImages
}
/// <inheritdoc />
public byte[] ReadSectorLong(ulong sectorAddress) => ReadSectorsLong(sectorAddress, 1);
public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
ReadSectorsLong(sectorAddress, 1, out buffer);
/// <inheritdoc />
public byte[] ReadSectorLong(ulong sectorAddress, uint track) => ReadSectorsLong(sectorAddress, 1, track);
/// <inheritdoc />
public byte[] ReadSectorsLong(ulong sectorAddress, uint length)
public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
{
buffer = null;
foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
if(sectorAddress >= kvp.Value)
foreach(Track alcTrack in _alcTracks.Values)
@@ -1389,11 +1392,15 @@ namespace Aaru.DiscImages
!_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra))
continue;
if(sectorAddress - kvp.Value < alcExtra.sectors + alcExtra.pregap)
return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key);
if(sectorAddress - kvp.Value >= alcExtra.sectors + alcExtra.pregap)
continue;
buffer = ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key);
return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
}
throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
return ErrorNumber.SectorNotFound;
}
/// <inheritdoc />