From f0fa4d4320715353c9489dbce7df72b1633e81b9 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 17 Mar 2022 23:54:41 +0000 Subject: [PATCH] Remove unused code. --- Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs | 2 -- Aaru.Core/Devices/Dumping/MiniDisc.cs | 3 +-- .../Devices/Dumping/PlayStationPortable/UMD.cs | 5 +---- Aaru.Core/Devices/Dumping/SSC.cs | 16 +++++++--------- Aaru.Core/Devices/Dumping/SecureDigital.cs | 4 ++-- Aaru.Core/Devices/Report/ATA.cs | 2 +- Aaru.Core/Sidecar/OpticalDisc.cs | 2 +- Aaru.Filesystems/Acorn.cs | 6 +++--- Aaru.Filesystems/CPM/CPM.cs | 7 ------- Aaru.Filesystems/CPM/Info.cs | 6 +++--- Aaru.Filesystems/FAT/Dir.cs | 2 +- Aaru.Filesystems/Fossil.cs | 2 +- Aaru.Filesystems/ISO9660/Info.cs | 2 +- Aaru.Filesystems/ISO9660/Super.cs | 4 ++-- Aaru.Filesystems/ProDOS.cs | 3 +++ Aaru.Filters/ForcedSeekStream.cs | 4 ++-- Aaru.Gui/Controls/BlockMap.cs | 2 +- Aaru.Images/AaruFormat/Write.cs | 2 +- Aaru.Images/Alcohol120/Read.cs | 11 +++++------ Aaru.Images/BlindWrite4/Read.cs | 4 ---- Aaru.Images/CDRDAO/Read.cs | 4 ---- Aaru.Images/CDRWin/Read.cs | 6 +++--- Aaru.Images/CloneCD/Read.cs | 10 +++------- Aaru.Images/DiscJuggler/Read.cs | 4 ---- Aaru.Images/Nero/Read.cs | 4 ---- Aaru.Images/VHD/Read.cs | 2 -- Aaru.Tests/Images/OpticalMediaImageTest.cs | 2 +- Aaru.Tests/Issues/OpticalImageReadIssueTest.cs | 2 -- .../WritableOpticalMediaImageTest.cs | 6 +----- Aaru/Commands/Image/Verify.cs | 16 +++++++--------- 30 files changed, 51 insertions(+), 94 deletions(-) diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs index 9200b331b..7c546e9f6 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs @@ -157,8 +157,6 @@ partial class Dump sectorsToTrim = (byte)(sectorsForOffset + 1); } - var forceFixOffset = false; - if(_supportsPlextorD8 && audioExtents.Contains(badSector)) sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim, supportedPlextorSubchannel, out cmdDuration); diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs index f907a8008..018b1be1b 100644 --- a/Aaru.Core/Devices/Dumping/MiniDisc.cs +++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs @@ -121,8 +121,7 @@ partial class Dump return; } - if(blocks != 0 && - blockSize != 0) + if(blocks != 0) { blocks++; diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs index 56901d50a..9c7104fd8 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs @@ -110,10 +110,7 @@ public partial class Dump ulong totalSize = blocks * blockSize; - if(totalSize > 1099511627776) - UpdateStatus?. - Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)"); - else if(totalSize > 1073741824) + if(totalSize > 1073741824) UpdateStatus?. Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)"); else if(totalSize > 1048576) diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs index 7a59020d2..494edbf7d 100644 --- a/Aaru.Core/Devices/Dumping/SSC.cs +++ b/Aaru.Core/Devices/Dumping/SSC.cs @@ -63,8 +63,8 @@ partial class Dump DecodedSense? decSense; bool sense; uint blockSize; - ulong blocks = 0; - MediaType dskType = MediaType.Unknown; + ulong blocks = 0; + MediaType dskType; DateTime start; DateTime end; double totalDuration = 0; @@ -109,8 +109,7 @@ partial class Dump PulseProgress?.Invoke("Rewinding, please wait..."); _dev.RequestSense(out senseBuf, _dev.Timeout, out duration); decSense = Sense.Decode(senseBuf); - } while(decSense is { ASC: 0x00 } && - decSense.Value.ASCQ is 0x1A or not (0x04 and 0x00)); + } while(decSense is { ASC: 0x00, ASCQ: 0x1A or not (0x04 and 0x00) }); _dev.RequestSense(out senseBuf, _dev.Timeout, out duration); decSense = Sense.Decode(senseBuf); @@ -286,7 +285,7 @@ partial class Dump blockSize = decMode.Value.Header.BlockDescriptors?[0].BlockLength ?? 0; - UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes)."); + UpdateStatus?.Invoke($"Device reports {blocks} blocks."); } else blockSize = 1; @@ -302,10 +301,9 @@ partial class Dump if(blockSize == 0) blockSize = 1; - if(dskType == MediaType.Unknown) - dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model, - scsiMediumTypeTape, scsiDensityCodeTape, blocks, blockSize, - _dev.IsUsb, false); + dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model, + scsiMediumTypeTape, scsiDensityCodeTape, blocks, blockSize, + _dev.IsUsb, false); if(dskType == MediaType.Unknown) dskType = MediaType.UnknownTape; diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs index 8a50cda18..f9b15f1ab 100644 --- a/Aaru.Core/Devices/Dumping/SecureDigital.cs +++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs @@ -333,7 +333,7 @@ public partial class Dump // Device is in timeout, reopen to reset if(_dev.LastError == 110) - sense = _dev.ReOpen(); + _dev.ReOpen(); } if(error) @@ -359,7 +359,7 @@ public partial class Dump // Device is in timeout, reopen to reset if(_dev.LastError == 110) - sense = _dev.ReOpen(); + _dev.ReOpen(); if(!error || blocksToRead == 1) diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs index 15337ce35..2fd70d43e 100644 --- a/Aaru.Core/Devices/Report/ATA.cs +++ b/Aaru.Core/Devices/Report/ATA.cs @@ -325,7 +325,7 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { ctx.AddTask("Trying READ SECTOR(S) in LBA48 mode...").IsIndeterminate(); - sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _); + sense = _dev.Read(out readBuf, out AtaErrorRegistersLba28 _, 0, 1, _dev.Timeout, out _); }); mediaTest.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 && diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs index aeb87d2e6..4a9914515 100644 --- a/Aaru.Core/Sidecar/OpticalDisc.cs +++ b/Aaru.Core/Sidecar/OpticalDisc.cs @@ -372,7 +372,7 @@ public sealed partial class Sidecar xmlTrk.StartSector = trk.StartSector; xmlTrk.EndSector = trk.EndSector; - int idx0 = -1; + int idx0; if(trk.Indexes?.TryGetValue(0, out idx0) == true && idx0 >= 0) diff --git a/Aaru.Filesystems/Acorn.cs b/Aaru.Filesystems/Acorn.cs index b632a3cfc..b0abfcd68 100644 --- a/Aaru.Filesystems/Acorn.cs +++ b/Aaru.Filesystems/Acorn.cs @@ -654,9 +654,9 @@ public sealed class AcornADFS : IFilesystem Don't add the check byte when calculating its value */ sumVector0 += sumVector3 >> 8; - sumVector1 += mapBase[rover + 1] + (sumVector0 >> 8); - sumVector2 += mapBase[rover + 2] + (sumVector1 >> 8); - sumVector3 += mapBase[rover + 3] + (sumVector2 >> 8); + sumVector1 += mapBase[1] + (sumVector0 >> 8); + sumVector2 += mapBase[2] + (sumVector1 >> 8); + sumVector3 += mapBase[3] + (sumVector2 >> 8); return (byte)((sumVector0 ^ sumVector1 ^ sumVector2 ^ sumVector3) & 0xff); } diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs index 492c87baa..88439ec7d 100644 --- a/Aaru.Filesystems/CPM/CPM.cs +++ b/Aaru.Filesystems/CPM/CPM.cs @@ -98,11 +98,4 @@ public sealed partial class CPM : IReadOnlyFilesystem /// public Dictionary Namespaces => null; - - static Dictionary GetDefaultOptions() => new() - { - { - "debug", false.ToString() - } - }; } \ No newline at end of file diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs index a09779f67..4140e5364 100644 --- a/Aaru.Filesystems/CPM/Info.cs +++ b/Aaru.Filesystems/CPM/Info.cs @@ -48,7 +48,7 @@ public sealed partial class CPM /// public bool Identify(IMediaImage imagePlugin, Partition partition) { - ErrorNumber errno = ErrorNumber.NoError; + ErrorNumber errno; // This will only continue on devices with a chance to have ever been used by CP/M while failing on all others // It's ugly, but will stop a lot of false positives @@ -245,8 +245,8 @@ public sealed partial class CPM _dpb.spt = (ushort)(amsSb.spt * (sectorSize / 128)); var directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / sectorSize); - errno = imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength, - out directory); + imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength, + out directory); // Build a CP/M disk definition _workingDefinition = new CpmDefinition diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs index 61c44c85d..14599604e 100644 --- a/Aaru.Filesystems/FAT/Dir.cs +++ b/Aaru.Filesystems/FAT/Dir.cs @@ -61,7 +61,7 @@ public sealed partial class FAT public ErrorNumber ReadDir(string path, out List contents) { contents = null; - ErrorNumber errno = ErrorNumber.NoError; + ErrorNumber errno; if(!_mounted) return ErrorNumber.AccessDenied; diff --git a/Aaru.Filesystems/Fossil.cs b/Aaru.Filesystems/Fossil.cs index cd1076976..427df7ae8 100644 --- a/Aaru.Filesystems/Fossil.cs +++ b/Aaru.Filesystems/Fossil.cs @@ -128,7 +128,7 @@ public sealed class Fossil : IFilesystem if(sbLocation <= partition.End) { - errno = imagePlugin.ReadSector(sbLocation, out sector); + imagePlugin.ReadSector(sbLocation, out sector); SuperBlock fsb = Marshal.ByteArrayToStructureBigEndian(sector); AaruConsole.DebugWriteLine("Fossil plugin", "magic 0x{0:X8} (expected 0x{1:X8})", fsb.magic, diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs index 5e6bb03bf..b8ab5a79a 100644 --- a/Aaru.Filesystems/ISO9660/Info.cs +++ b/Aaru.Filesystems/ISO9660/Info.cs @@ -115,7 +115,7 @@ public sealed partial class ISO9660 ulong counter = 0; - ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector); + ErrorNumber errno = imagePlugin.ReadSector(16 + partition.Start, out byte[] vdSector); if(errno != ErrorNumber.NoError) return; diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs index fcb83ea85..57aef8581 100644 --- a/Aaru.Filesystems/ISO9660/Super.cs +++ b/Aaru.Filesystems/ISO9660/Super.cs @@ -113,7 +113,7 @@ public sealed partial class ISO9660 ulong counter = 0; - ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector); + ErrorNumber errno = imagePlugin.ReadSector(16 + partition.Start, out byte[] vdSector); if(errno != ErrorNumber.NoError) return errno; @@ -393,7 +393,7 @@ public sealed partial class ISO9660 rootLocation = _pathTable[0].Extent; - errno = ReadSector(_pathTable[0].Extent, out firstRootSector); + ReadSector(_pathTable[0].Extent, out firstRootSector); if(_highSierra) { diff --git a/Aaru.Filesystems/ProDOS.cs b/Aaru.Filesystems/ProDOS.cs index 82e139d2f..39c431ca1 100644 --- a/Aaru.Filesystems/ProDOS.cs +++ b/Aaru.Filesystems/ProDOS.cs @@ -107,6 +107,9 @@ public sealed class ProDOSPlugin : IFilesystem ErrorNumber errno = imagePlugin.ReadSectors(2 * multiplier + partition.Start, multiplier, out byte[] rootDirectoryKeyBlock); + if(errno != ErrorNumber.NoError) + return false; + var apmFromHddOnCd = false; if(imagePlugin.Info.SectorSize is 2352 or 2448 or 2048) diff --git a/Aaru.Filters/ForcedSeekStream.cs b/Aaru.Filters/ForcedSeekStream.cs index 5b2a0cb55..5f0e3eca7 100644 --- a/Aaru.Filters/ForcedSeekStream.cs +++ b/Aaru.Filters/ForcedSeekStream.cs @@ -134,8 +134,8 @@ public sealed class ForcedSeekStream : Stream where T : Stream var fullBufferReads = (int)(toPosition / BUFFER_LEN); var restToRead = (int)(toPosition % BUFFER_LEN); byte[] buffer; - var bufPos = 0; - int left = BUFFER_LEN; + int bufPos; + int left; for(var i = 0; i < fullBufferReads; i++) { diff --git a/Aaru.Gui/Controls/BlockMap.cs b/Aaru.Gui/Controls/BlockMap.cs index 964c59b0e..1cbfd52f8 100644 --- a/Aaru.Gui/Controls/BlockMap.cs +++ b/Aaru.Gui/Controls/BlockMap.cs @@ -221,7 +221,7 @@ public sealed class BlockMap : ItemsControl } } - public override void Render([NotNull] DrawingContext context) + public override void Render(DrawingContext context) { if((int?)_bitmap?.Size.Height != (int)Height || (int?)_bitmap?.Size.Width != (int)Width) diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs index ffbe45f36..3a71ba3a2 100644 --- a/Aaru.Images/AaruFormat/Write.cs +++ b/Aaru.Images/AaruFormat/Write.cs @@ -2455,7 +2455,7 @@ public sealed partial class AaruFormat var cmpCrc64Context = new Crc64Context(); byte[] lzmaProperties = Array.Empty(); - var compressedLength = 0; + int compressedLength; switch(_currentBlockHeader.compression) { diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 56eff102a..c451ea9e1 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -498,10 +498,10 @@ public sealed partial class Alcohol120 // First track is data firstData |= alcoholTrack.point == 1 && - alcoholTrack.mode is not (TrackMode.Audio and TrackMode.AudioAlt); + alcoholTrack.mode != TrackMode.Audio && alcoholTrack.mode != TrackMode.AudioAlt; // Any non first track is data - data |= alcoholTrack.point != 1 && alcoholTrack.mode is not (TrackMode.Audio and TrackMode.AudioAlt); + data |= alcoholTrack.point != 1 && alcoholTrack.mode != TrackMode.Audio && alcoholTrack.mode != TrackMode.AudioAlt; // Any non first track is audio audio |= alcoholTrack.point != 1 && alcoholTrack.mode is TrackMode.Audio or TrackMode.AudioAlt; @@ -1446,7 +1446,7 @@ public sealed partial class Alcohol120 sectorAddress -= alcExtra.pregap - 150; } - uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip); + uint pregapBytes = alcExtra.pregap * (sectorSize + sectorSkip); var fileOffset = (long)alcTrack.startOffset; if(alcTrack.startOffset >= pregapBytes) @@ -1455,11 +1455,10 @@ public sealed partial class Alcohol120 _imageStream = _alcImage.GetDataForkStream(); var br = new BinaryReader(_imageStream); - br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorSize + sectorSkip)), SeekOrigin.Begin); - if(sectorOffset == 0 && - sectorSkip == 0) + if(sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * length)); else for(var i = 0; i < length; i++) diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs index e87054983..f76e24011 100644 --- a/Aaru.Images/BlindWrite4/Read.cs +++ b/Aaru.Images/BlindWrite4/Read.cs @@ -850,12 +850,8 @@ public sealed partial class BlindWrite4 from track in Tracks where track.Sequence == kvp.Key where sectorAddress - kvp.Value < track.EndSector - track.StartSector + 1 select kvp) - { return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer); - return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError; - } - return ErrorNumber.SectorNotFound; } diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs index 12ef9fabb..43e5d0f3e 100644 --- a/Aaru.Images/CDRDAO/Read.cs +++ b/Aaru.Images/CDRDAO/Read.cs @@ -940,12 +940,8 @@ public sealed partial class Cdrdao from cdrdaoTrack in _discimage.Tracks where cdrdaoTrack.Sequence == kvp.Key where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp) - { return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer); - return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError; - } - return ErrorNumber.SectorNotFound; } diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 37d4be426..14a0746f7 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -1685,7 +1685,7 @@ public sealed partial class CdrWin public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer) { buffer = null; - CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); + CdrWinTrack aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; @@ -1864,7 +1864,7 @@ public sealed partial class CdrWin if(tag is SectorTagType.CdTrackFlags or SectorTagType.CdTrackIsrc) track = (uint)sectorAddress; - CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); + CdrWinTrack aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; @@ -2140,7 +2140,7 @@ public sealed partial class CdrWin if(!_isCd) return ReadSectors(sectorAddress, length, track, out buffer); - CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); + CdrWinTrack aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index f4168dd4e..c82036bee 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -961,12 +961,8 @@ public sealed partial class CloneCd Where(t => sectorAddress - t.kvp.Value < t.track.EndSector - t.track.StartSector + 1). Select(t => t.kvp)) - { return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer); - return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError; - } - return ErrorNumber.SectorNotFound; } @@ -974,7 +970,7 @@ public sealed partial class CloneCd public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer) { buffer = null; - Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); + Track aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; @@ -1064,7 +1060,7 @@ public sealed partial class CloneCd if(tag == SectorTagType.CdTrackFlags) track = (uint)sectorAddress; - Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); + Track aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; @@ -1352,7 +1348,7 @@ public sealed partial class CloneCd public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer) { buffer = null; - Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); + Track aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track); if(aaruTrack is null) return ErrorNumber.SectorNotFound; diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs index 6c05e5fe9..d2ad9ce1c 100644 --- a/Aaru.Images/DiscJuggler/Read.cs +++ b/Aaru.Images/DiscJuggler/Read.cs @@ -858,12 +858,8 @@ public sealed partial class DiscJuggler from track in Tracks where track.Sequence == kvp.Key where sectorAddress - kvp.Value < track.EndSector - track.StartSector + 1 select kvp) - { return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer); - return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError; - } - return ErrorNumber.SectorNotFound; } diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs index 76d960ade..e3eb2aa81 100644 --- a/Aaru.Images/Nero/Read.cs +++ b/Aaru.Images/Nero/Read.cs @@ -1604,12 +1604,8 @@ public sealed partial class Nero from track in Tracks where track.Sequence == kvp.Key where sectorAddress - kvp.Value <= track.EndSector - track.StartSector select kvp) - { return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer); - return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError; - } - return ErrorNumber.SectorNotFound; } diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs index 31cf1f6ed..d5ca1fd93 100644 --- a/Aaru.Images/VHD/Read.cs +++ b/Aaru.Images/VHD/Read.cs @@ -661,8 +661,6 @@ public sealed partial class Vhd return ErrorNumber.InvalidArgument; } - - return ErrorNumber.NoError; } case TYPE_DEPRECATED1: diff --git a/Aaru.Tests/Images/OpticalMediaImageTest.cs b/Aaru.Tests/Images/OpticalMediaImageTest.cs index f21aa7352..1188582e2 100644 --- a/Aaru.Tests/Images/OpticalMediaImageTest.cs +++ b/Aaru.Tests/Images/OpticalMediaImageTest.cs @@ -223,7 +223,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest if(track.FileSystems[i].Contents != null || track.FileSystems[i].ContentsJson != null || File.Exists($"{testFile}.track{track.Number}.filesystem{i}.contents.json")) - Assert.NotNull(rofs, + Assert.NotNull(null, $"Could not instantiate filesystem for {testFile}, track {track.Number}, filesystem {i}"); continue; diff --git a/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs b/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs index 90a915284..e79444ed1 100644 --- a/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs +++ b/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs @@ -43,8 +43,6 @@ public abstract class OpticalImageReadIssueTest var ctx = new Crc32Context(); - Checksum trackChecksum = null; - ulong previousTrackEnd = 0; List inputTracks = opticalInput.Tracks; diff --git a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs index 31f48c4a6..3b80b8d5a 100644 --- a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs +++ b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs @@ -167,12 +167,8 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag => outputFormat.SupportedMediaTags.Contains(mediaTag))) - { - ErrorNumber errno = inputFormat.ReadMediaTag(mediaTag, out byte[] buffer); - - if(errno == ErrorNumber.NoError) + if(inputFormat.ReadMediaTag(mediaTag, out byte[] buffer) == ErrorNumber.NoError) outputFormat.WriteMediaTag(buffer, mediaTag); - } Assert.IsTrue(outputFormat.SetTracks(inputFormat.Tracks), $"Error {outputFormat.ErrorMessage} sending tracks list to output image."); diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs index 833023a7e..c06e65837 100644 --- a/Aaru/Commands/Image/Verify.cs +++ b/Aaru/Commands/Image/Verify.cs @@ -345,14 +345,14 @@ sealed class VerifyCommand : Command TimeSpan checkTime = endCheck - startCheck; - if(unknownSectors > 0) + if(unknownLbas.Count > 0) AaruConsole.WriteLine("There is at least one sector that does not contain a checksum"); - if(errorSectors > 0) + if(failingLbas.Count > 0) AaruConsole.WriteLine("There is at least one sector with incorrect checksum or errors"); - if(unknownSectors == 0 && - errorSectors == 0) + if(unknownLbas.Count == 0 && + failingLbas.Count == 0) AaruConsole.WriteLine("All sector checksums are correct"); AaruConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds); @@ -391,15 +391,13 @@ sealed class VerifyCommand : Command { case null when correctSectors is null: return (int)ErrorNumber.NotVerifiable; case null when correctSectors == false: return (int)ErrorNumber.BadSectorsImageNotVerified; - case null when correctSectors == true: return (int)ErrorNumber.CorrectSectorsImageNotVerified; + case null: return (int)ErrorNumber.CorrectSectorsImageNotVerified; case false when correctSectors is null: return (int)ErrorNumber.BadImageSectorsNotVerified; case false when correctSectors == false: return (int)ErrorNumber.BadImageBadSectors; - case false when correctSectors == true: return (int)ErrorNumber.CorrectSectorsBadImage; + case false: return (int)ErrorNumber.CorrectSectorsBadImage; case true when correctSectors is null: return (int)ErrorNumber.CorrectImageSectorsNotVerified; case true when correctSectors == false: return (int)ErrorNumber.CorrectImageBadSectors; - case true when correctSectors == true: return (int)ErrorNumber.NoError; + case true: return (int)ErrorNumber.NoError; } - - return (int)ErrorNumber.NoError; } } \ No newline at end of file