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

Update ReadSector and ReadSectors methods to include sector status output

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-22 14:28:58 +01:00
parent 1003088cc3
commit 0ac2a48fb6
238 changed files with 5881 additions and 5196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Aaru.Tests/Images/BlockMediaImageTest.cs
View File

@@ -118,12 +118,15 @@ public abstract class BlockMediaImageTest : BaseMediaImageTest
if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
{
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector, out _);
doneSectors += SECTORS_TO_READ;
}
else
{
errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector);
errno = image.ReadSectors(doneSectors,
(uint)(image.Info.Sectors - doneSectors),
out sector,
out _);
doneSectors += image.Info.Sectors - doneSectors;
}

21
Aaru.Tests/Images/OpticalMediaImageTest.cs
View File

@@ -430,11 +430,13 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
? image.ReadSectorsLong(doneSectors,
SECTORS_TO_READ,
currentTrack.Sequence,
out sector)
out sector,
out SectorStatus[] _)
: image.ReadSectors(doneSectors,
SECTORS_TO_READ,
currentTrack.Sequence,
out sector);
out sector,
out SectorStatus[] _);
doneSectors += SECTORS_TO_READ;
}
@@ -444,11 +446,13 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
? image.ReadSectorsLong(doneSectors,
(uint)(sectors - doneSectors),
currentTrack.Sequence,
out sector)
out sector,
out SectorStatus[] _)
: image.ReadSectors(doneSectors,
(uint)(sectors - doneSectors),
currentTrack.Sequence,
out sector);
out sector,
out SectorStatus[] _);
doneSectors += sectors - doneSectors;
}
@@ -518,14 +522,19 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
{
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
errno = image.ReadSectors(doneSectors,
SECTORS_TO_READ,
out sector,
out SectorStatus[] _);
doneSectors += SECTORS_TO_READ;
}
else
{
errno = image.ReadSectors(doneSectors,
(uint)(image.Info.Sectors - doneSectors),
out sector);
out sector,
out SectorStatus[] _);
doneSectors += image.Info.Sectors - doneSectors;
}

7
Aaru.Tests/Images/TapeMediaImageTest.cs
View File

@@ -166,12 +166,15 @@ public abstract class TapeMediaImageTest : BaseMediaImageTest
if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
{
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector, out _);
doneSectors += SECTORS_TO_READ;
}
else
{
errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector);
errno = image.ReadSectors(doneSectors,
(uint)(image.Info.Sectors - doneSectors),
out sector,
out _);
doneSectors += image.Info.Sectors - doneSectors;
}

4
Aaru.Tests/Issues/ImageReadIssueTest.cs
View File

@@ -50,12 +50,12 @@ public abstract class ImageReadIssueTest
if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
{
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
errno = image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector, out _);
doneSectors += SECTORS_TO_READ;
}
else
{
errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector);
errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector, out _);
doneSectors += image.Info.Sectors - doneSectors;
}

14
Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs
View File

@@ -154,8 +154,11 @@ public abstract class OpticalImageConvertIssueTest
if(UseLong)
{
errno = sectorsToDo == 1
? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
: inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo, out sector);
? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector, out _)
: inputFormat.ReadSectorsLong(doneSectors + track.StartSector,
sectorsToDo,
out sector,
out _);
if(errno == ErrorNumber.NoError)
{
@@ -174,8 +177,11 @@ public abstract class OpticalImageConvertIssueTest
if(!UseLong || useNotLong)
{
errno = sectorsToDo == 1
? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
: inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo, out sector);
? inputFormat.ReadSector(doneSectors + track.StartSector, out sector, out _)
: inputFormat.ReadSectors(doneSectors + track.StartSector,
sectorsToDo,
out sector,
out _);
Assert.That(errno, Is.EqualTo(ErrorNumber.NoError));

9
Aaru.Tests/Issues/OpticalImageReadIssueTest.cs
View File

@@ -64,7 +64,11 @@ public abstract class OpticalImageReadIssueTest
if(sectors - doneSectors >= SECTORS_TO_READ)
{
errno = opticalInput.ReadSectors(doneSectors, SECTORS_TO_READ, currentTrack.Sequence, out sector);
errno = opticalInput.ReadSectors(doneSectors,
SECTORS_TO_READ,
currentTrack.Sequence,
out sector,
out _);
doneSectors += SECTORS_TO_READ;
}
@@ -73,7 +77,8 @@ public abstract class OpticalImageReadIssueTest
errno = opticalInput.ReadSectors(doneSectors,
(uint)(sectors - doneSectors),
currentTrack.Sequence,
out sector);
out sector,
out _);
doneSectors += sectors - doneSectors;
}

22
Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs
View File

@@ -246,10 +246,11 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
if(useLong)
{
errno = sectorsToDo == 1
? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector, out _)
: inputFormat.ReadSectorsLong(doneSectors + track.StartSector,
sectorsToDo,
out sector);
out sector,
out _);
if(errno == ErrorNumber.NoError)
{
@@ -268,10 +269,11 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
if(!useLong || useNotLong)
{
errno = sectorsToDo == 1
? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
? inputFormat.ReadSector(doneSectors + track.StartSector, out sector, out _)
: inputFormat.ReadSectors(doneSectors + track.StartSector,
sectorsToDo,
out sector);
out sector,
out _);
Assert.That(errno, Is.EqualTo(ErrorNumber.NoError));
@@ -691,11 +693,13 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
? image.ReadSectorsLong(doneSectors,
SECTORS_TO_READ,
currentTrack.Sequence,
out sector)
out sector,
out _)
: image.ReadSectors(doneSectors,
SECTORS_TO_READ,
currentTrack.Sequence,
out sector);
out sector,
out _);
doneSectors += SECTORS_TO_READ;
}
@@ -705,11 +709,13 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
? image.ReadSectorsLong(doneSectors,
(uint)(sectors - doneSectors),
currentTrack.Sequence,
out sector)
out sector,
out _)
: image.ReadSectors(doneSectors,
(uint)(sectors - doneSectors),
currentTrack.Sequence,
out sector);
out sector,
out _);
doneSectors += sectors - doneSectors;
}