From 5f14f0e79cdf31b4e8bd38db46547222b1cb64dd Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 16 Mar 2022 00:31:33 +0000 Subject: [PATCH] Fix unused variables. --- Aaru.Checksums | 2 +- Aaru.Core/Devices/Report/GdRomSwapTrick.cs | 2 +- Aaru.Filesystems/FAT/BPB.cs | 1 - Aaru.Filesystems/ISO9660/Dir.cs | 16 ++++++++++++++++ Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs | 14 +++++++------- .../ViewModels/Windows/ImageConvertViewModel.cs | 10 +++++----- .../ViewModels/Windows/MainWindowViewModel.cs | 8 ++++---- Aaru.Images/CloneCD/Read.cs | 2 +- Aaru.Images/IMD/Enums.cs | 3 +++ Aaru.Images/NDIF/Read.cs | 3 +-- Aaru.Tests/Images/OpticalMediaImageTest.cs | 2 +- .../Issues/OpticalImageConvertIssueTest.cs | 2 +- .../WritableOpticalMediaImageTest.cs | 2 +- Aaru/Commands/Image/Convert.cs | 4 ++-- Aaru/Commands/Media/Dump.cs | 2 +- 15 files changed, 45 insertions(+), 28 deletions(-) diff --git a/Aaru.Checksums b/Aaru.Checksums index 19c7f3d4f..4b209cb4c 160000 --- a/Aaru.Checksums +++ b/Aaru.Checksums @@ -1 +1 @@ -Subproject commit 19c7f3d4ff80c9ff938cfd04f03b6f8f658a067d +Subproject commit 4b209cb4c74bea1d9a5404600641e8db89d01762 diff --git a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs index 559d80b55..ada2f79f3 100644 --- a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs +++ b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs @@ -1563,7 +1563,7 @@ public sealed partial class DeviceReport subchannel = MmcSubchannel.Q16; } - Console.CancelKeyPress += (sender, e) => + Console.CancelKeyPress += (_, e) => { e.Cancel = true; aborted = true; diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs index dbbae2177..054ff9cb3 100644 --- a/Aaru.Filesystems/FAT/BPB.cs +++ b/Aaru.Filesystems/FAT/BPB.cs @@ -52,7 +52,6 @@ public sealed partial class FAT minBootNearJump = 0; andosOemCorrect = false; bootable = false; - ErrorNumber errno; humanBpb = Marshal.ByteArrayToStructureBigEndian(bpbSector); atariBpb = Marshal.ByteArrayToStructureLittleEndian(bpbSector); diff --git a/Aaru.Filesystems/ISO9660/Dir.cs b/Aaru.Filesystems/ISO9660/Dir.cs index 02165dd1b..7ba18727a 100644 --- a/Aaru.Filesystems/ISO9660/Dir.cs +++ b/Aaru.Filesystems/ISO9660/Dir.cs @@ -842,6 +842,13 @@ public sealed partial class ISO9660 ErrorNumber errno = ReadSector(cl.child_dir_lba, out byte[] childSector); + if(errno != ErrorNumber.NoError) + { + systemAreaOff = end; + + break; + } + DirectoryRecord childRecord = Marshal.ByteArrayToStructureLittleEndian(childSector); @@ -1053,6 +1060,9 @@ public sealed partial class ISO9660 { ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); + if(errno != ErrorNumber.NoError) + continue; + CdiDirectoryRecord record = Marshal.ByteArrayToStructureBigEndian(sector, tEntry.XattrLength, _cdiDirectoryRecordSize); @@ -1103,6 +1113,9 @@ public sealed partial class ISO9660 { ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); + if(errno != ErrorNumber.NoError) + continue; + DirectoryRecord record = Marshal.ByteArrayToStructureLittleEndian(sector, tEntry.XattrLength, _directoryRecordSize); @@ -1153,6 +1166,9 @@ public sealed partial class ISO9660 { ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); + if(errno != ErrorNumber.NoError) + continue; + HighSierraDirectoryRecord record = Marshal.ByteArrayToStructureLittleEndian(sector, tEntry.XattrLength, _highSierraDirectoryRecordSize); diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs index d8fd19b7e..50585e8e2 100644 --- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs +++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs @@ -735,7 +735,7 @@ public sealed class ImageInfoViewModel : ViewModelBase _imageEntropy = new ImageEntropy(); _imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy); - _imageEntropy.Closed += (sender, args) => _imageEntropy = null; + _imageEntropy.Closed += (_, _) => _imageEntropy = null; _imageEntropy.Show(); } @@ -752,7 +752,7 @@ public sealed class ImageInfoViewModel : ViewModelBase _imageVerify = new ImageVerify(); _imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify); - _imageVerify.Closed += (sender, args) => _imageVerify = null; + _imageVerify.Closed += (_, _) => _imageVerify = null; _imageVerify.Show(); } @@ -769,7 +769,7 @@ public sealed class ImageInfoViewModel : ViewModelBase _imageChecksum = new ImageChecksum(); _imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum); - _imageChecksum.Closed += (sender, args) => _imageChecksum = null; + _imageChecksum.Closed += (_, _) => _imageChecksum = null; _imageChecksum.Show(); } @@ -786,7 +786,7 @@ public sealed class ImageInfoViewModel : ViewModelBase _imageConvert = new ImageConvert(); _imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert); - _imageConvert.Closed += (sender, args) => _imageConvert = null; + _imageConvert.Closed += (_, _) => _imageConvert = null; _imageConvert.Show(); } @@ -806,7 +806,7 @@ public sealed class ImageInfoViewModel : ViewModelBase _imageSidecar.DataContext = new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar); - _imageSidecar.Closed += (sender, args) => _imageSidecar = null; + _imageSidecar.Closed += (_, _) => _imageSidecar = null; _imageSidecar.Show(); } @@ -825,7 +825,7 @@ public sealed class ImageInfoViewModel : ViewModelBase DataContext = new ViewSectorViewModel(_imageFormat) }; - _viewSector.Closed += (sender, args) => _viewSector = null; + _viewSector.Closed += (_, _) => _viewSector = null; _viewSector.Show(); } @@ -844,7 +844,7 @@ public sealed class ImageInfoViewModel : ViewModelBase DataContext = new DecodeMediaTagsViewModel(_imageFormat) }; - _decodeMediaTags.Closed += (sender, args) => _decodeMediaTags = null; + _decodeMediaTags.Closed += (_, _) => _decodeMediaTags = null; _decodeMediaTags.Show(); } diff --git a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs index 6b04a6ecf..7fada83d3 100644 --- a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs @@ -844,7 +844,7 @@ public sealed class ImageConvertViewModel : ViewModelBase ErrorNumber errno; - foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.TakeWhile(mediaTag => !_cancel)) + foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.TakeWhile(_ => !_cancel)) { await Dispatcher.UIThread.InvokeAsync(() => { @@ -1100,7 +1100,7 @@ public sealed class ImageConvertViewModel : ViewModelBase subchannelExtents.Add((int)s); } - foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.TakeWhile(tag => useLong && !_cancel)) + foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.TakeWhile(_ => useLong && !_cancel)) { switch(tag) { @@ -1310,7 +1310,7 @@ public sealed class ImageConvertViewModel : ViewModelBase } else { - foreach(Track track in tracks.TakeWhile(track => !_cancel)) + foreach(Track track in tracks.TakeWhile(_ => !_cancel)) { doneSectors = 0; ulong trackSectors = track.EndSector - track.StartSector + 1; @@ -1451,7 +1451,7 @@ public sealed class ImageConvertViewModel : ViewModelBase }); foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t). - TakeWhile(tag => useLong && !_cancel)) + TakeWhile(_ => useLong && !_cancel)) { switch(tag) { @@ -1470,7 +1470,7 @@ public sealed class ImageConvertViewModel : ViewModelBase if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag)) continue; - foreach(Track track in tracks.TakeWhile(track => !_cancel)) + foreach(Track track in tracks.TakeWhile(_ => !_cancel)) { doneSectors = 0; ulong trackSectors = track.EndSector - track.StartSector + 1; diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs index a911b2422..3afbd349d 100644 --- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs @@ -346,7 +346,7 @@ public sealed class MainWindowViewModel : ViewModelBase var imageEntropyWindow = new ImageEntropy(); imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow); - imageEntropyWindow.Closed += (sender, args) => imageEntropyWindow = null; + imageEntropyWindow.Closed += (_, _) => imageEntropyWindow = null; imageEntropyWindow.Show(); } @@ -359,7 +359,7 @@ public sealed class MainWindowViewModel : ViewModelBase var imageVerifyWindow = new ImageVerify(); imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow); - imageVerifyWindow.Closed += (sender, args) => imageVerifyWindow = null; + imageVerifyWindow.Closed += (_, _) => imageVerifyWindow = null; imageVerifyWindow.Show(); } @@ -372,7 +372,7 @@ public sealed class MainWindowViewModel : ViewModelBase var imageChecksumWindow = new ImageChecksum(); imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow); - imageChecksumWindow.Closed += (sender, args) => imageChecksumWindow = null; + imageChecksumWindow.Closed += (_, _) => imageChecksumWindow = null; imageChecksumWindow.Show(); } @@ -387,7 +387,7 @@ public sealed class MainWindowViewModel : ViewModelBase imageConvertWindow.DataContext = new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow); - imageConvertWindow.Closed += (sender, args) => imageConvertWindow = null; + imageConvertWindow.Closed += (_, _) => imageConvertWindow = null; imageConvertWindow.Show(); } diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs index c4a8f6755..f4168dd4e 100644 --- a/Aaru.Images/CloneCD/Read.cs +++ b/Aaru.Images/CloneCD/Read.cs @@ -953,7 +953,7 @@ public sealed partial class CloneCd buffer = null; foreach(KeyValuePair kvp in _offsetMap.Where(kvp => sectorAddress >= kvp.Value). - SelectMany(kvp => Tracks, (kvp, track) => new + SelectMany(_ => Tracks, (kvp, track) => new { kvp, track diff --git a/Aaru.Images/IMD/Enums.cs b/Aaru.Images/IMD/Enums.cs index 30219c7a1..d14ba8e07 100644 --- a/Aaru.Images/IMD/Enums.cs +++ b/Aaru.Images/IMD/Enums.cs @@ -32,8 +32,11 @@ namespace Aaru.DiscImages; +using System.Diagnostics.CodeAnalysis; + public sealed partial class Imd { + [SuppressMessage("ReSharper", "UnusedMember.Local")] enum TransferRate : byte { /// 500 kbps in FM mode diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs index e15797234..d7bc8c484 100644 --- a/Aaru.Images/NDIF/Read.cs +++ b/Aaru.Images/NDIF/Read.cs @@ -84,7 +84,7 @@ public sealed partial class Ndif _imageInfo.Sectors = 0; - foreach(byte[] bcem in bcems.Select(id => rsrc.GetResource(NDIF_RESOURCEID))) + foreach(byte[] bcem in bcems.Select(_ => rsrc.GetResource(NDIF_RESOURCEID))) { if(bcem.Length < 128) return ErrorNumber.InvalidArgument; @@ -362,7 +362,6 @@ public sealed partial class Ndif var cmpBuffer = new byte[currentChunk.length]; _imageStream.Seek(currentChunk.offset, SeekOrigin.Begin); _imageStream.Read(cmpBuffer, 0, cmpBuffer.Length); - var cmpMs = new MemoryStream(cmpBuffer); int realSize; switch(currentChunk.type) diff --git a/Aaru.Tests/Images/OpticalMediaImageTest.cs b/Aaru.Tests/Images/OpticalMediaImageTest.cs index 52a8b6fd3..f21aa7352 100644 --- a/Aaru.Tests/Images/OpticalMediaImageTest.cs +++ b/Aaru.Tests/Images/OpticalMediaImageTest.cs @@ -288,7 +288,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest Assert.Multiple(() => { - Parallel.For(0L, Tests.Length, (i, state) => + Parallel.For(0L, Tests.Length, (i, _) => { string testFile = Tests[i].TestFile; diff --git a/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs b/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs index d87ac1c5e..6ebebf386 100644 --- a/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs +++ b/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs @@ -237,7 +237,7 @@ public abstract class OpticalImageConvertIssueTest subchannelExtents.Add((int)s); } - foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(tag => UseLong)) + foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(_ => UseLong)) { switch(tag) { diff --git a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs index 4fddbfbce..0431e7ba7 100644 --- a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs +++ b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs @@ -305,7 +305,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest } foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t). - TakeWhile(tag => useLong)) + TakeWhile(_ => useLong)) { switch(tag) { diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs index 6e71e35ff..e035a2dea 100644 --- a/Aaru/Commands/Image/Convert.cs +++ b/Aaru/Commands/Image/Convert.cs @@ -1013,7 +1013,7 @@ sealed class ConvertImageCommand : Command subchannelExtents.Add((int)s); } - foreach(SectorTagType tag in inputOptical.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(tag => useLong)) + foreach(SectorTagType tag in inputOptical.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(_ => useLong)) { switch(tag) { @@ -1411,7 +1411,7 @@ sealed class ConvertImageCommand : Command mediaTask.StopTask(); - foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.TakeWhile(tag => useLong)) + foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.TakeWhile(_ => useLong)) { switch(tag) { diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs index 25f28c6e8..1d4dedd8b 100644 --- a/Aaru/Commands/Media/Dump.cs +++ b/Aaru/Commands/Media/Dump.cs @@ -750,7 +750,7 @@ sealed class DumpMediaCommand : Command _progressTask2.MaxValue = maximum; }; - Console.CancelKeyPress += (sender, e) => + Console.CancelKeyPress += (_, e) => { e.Cancel = true; dumper.Abort();