Fix unused variables.

This commit is contained in:
2022-03-16 00:31:33 +00:00
parent d4b1e63e96
commit 5f14f0e79c
15 changed files with 45 additions and 28 deletions

View File

@@ -1563,7 +1563,7 @@ public sealed partial class DeviceReport
subchannel = MmcSubchannel.Q16; subchannel = MmcSubchannel.Q16;
} }
Console.CancelKeyPress += (sender, e) => Console.CancelKeyPress += (_, e) =>
{ {
e.Cancel = true; e.Cancel = true;
aborted = true; aborted = true;

View File

@@ -52,7 +52,6 @@ public sealed partial class FAT
minBootNearJump = 0; minBootNearJump = 0;
andosOemCorrect = false; andosOemCorrect = false;
bootable = false; bootable = false;
ErrorNumber errno;
humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector); humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector);
atariBpb = Marshal.ByteArrayToStructureLittleEndian<AtariParameterBlock>(bpbSector); atariBpb = Marshal.ByteArrayToStructureLittleEndian<AtariParameterBlock>(bpbSector);

View File

@@ -842,6 +842,13 @@ public sealed partial class ISO9660
ErrorNumber errno = ReadSector(cl.child_dir_lba, out byte[] childSector); ErrorNumber errno = ReadSector(cl.child_dir_lba, out byte[] childSector);
if(errno != ErrorNumber.NoError)
{
systemAreaOff = end;
break;
}
DirectoryRecord childRecord = DirectoryRecord childRecord =
Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(childSector); Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(childSector);
@@ -1053,6 +1060,9 @@ public sealed partial class ISO9660
{ {
ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
if(errno != ErrorNumber.NoError)
continue;
CdiDirectoryRecord record = CdiDirectoryRecord record =
Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(sector, tEntry.XattrLength, Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(sector, tEntry.XattrLength,
_cdiDirectoryRecordSize); _cdiDirectoryRecordSize);
@@ -1103,6 +1113,9 @@ public sealed partial class ISO9660
{ {
ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
if(errno != ErrorNumber.NoError)
continue;
DirectoryRecord record = DirectoryRecord record =
Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(sector, tEntry.XattrLength, Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(sector, tEntry.XattrLength,
_directoryRecordSize); _directoryRecordSize);
@@ -1153,6 +1166,9 @@ public sealed partial class ISO9660
{ {
ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector); ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
if(errno != ErrorNumber.NoError)
continue;
HighSierraDirectoryRecord record = HighSierraDirectoryRecord record =
Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(sector, tEntry.XattrLength, Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(sector, tEntry.XattrLength,
_highSierraDirectoryRecordSize); _highSierraDirectoryRecordSize);

View File

@@ -735,7 +735,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
_imageEntropy = new ImageEntropy(); _imageEntropy = new ImageEntropy();
_imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy); _imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy);
_imageEntropy.Closed += (sender, args) => _imageEntropy = null; _imageEntropy.Closed += (_, _) => _imageEntropy = null;
_imageEntropy.Show(); _imageEntropy.Show();
} }
@@ -752,7 +752,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
_imageVerify = new ImageVerify(); _imageVerify = new ImageVerify();
_imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify); _imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify);
_imageVerify.Closed += (sender, args) => _imageVerify = null; _imageVerify.Closed += (_, _) => _imageVerify = null;
_imageVerify.Show(); _imageVerify.Show();
} }
@@ -769,7 +769,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
_imageChecksum = new ImageChecksum(); _imageChecksum = new ImageChecksum();
_imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum); _imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum);
_imageChecksum.Closed += (sender, args) => _imageChecksum = null; _imageChecksum.Closed += (_, _) => _imageChecksum = null;
_imageChecksum.Show(); _imageChecksum.Show();
} }
@@ -786,7 +786,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
_imageConvert = new ImageConvert(); _imageConvert = new ImageConvert();
_imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert); _imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert);
_imageConvert.Closed += (sender, args) => _imageConvert = null; _imageConvert.Closed += (_, _) => _imageConvert = null;
_imageConvert.Show(); _imageConvert.Show();
} }
@@ -806,7 +806,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
_imageSidecar.DataContext = _imageSidecar.DataContext =
new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar); new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar);
_imageSidecar.Closed += (sender, args) => _imageSidecar = null; _imageSidecar.Closed += (_, _) => _imageSidecar = null;
_imageSidecar.Show(); _imageSidecar.Show();
} }
@@ -825,7 +825,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
DataContext = new ViewSectorViewModel(_imageFormat) DataContext = new ViewSectorViewModel(_imageFormat)
}; };
_viewSector.Closed += (sender, args) => _viewSector = null; _viewSector.Closed += (_, _) => _viewSector = null;
_viewSector.Show(); _viewSector.Show();
} }
@@ -844,7 +844,7 @@ public sealed class ImageInfoViewModel : ViewModelBase
DataContext = new DecodeMediaTagsViewModel(_imageFormat) DataContext = new DecodeMediaTagsViewModel(_imageFormat)
}; };
_decodeMediaTags.Closed += (sender, args) => _decodeMediaTags = null; _decodeMediaTags.Closed += (_, _) => _decodeMediaTags = null;
_decodeMediaTags.Show(); _decodeMediaTags.Show();
} }

View File

@@ -844,7 +844,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
ErrorNumber errno; 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(() => await Dispatcher.UIThread.InvokeAsync(() =>
{ {
@@ -1100,7 +1100,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
subchannelExtents.Add((int)s); 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) switch(tag)
{ {
@@ -1310,7 +1310,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
} }
else else
{ {
foreach(Track track in tracks.TakeWhile(track => !_cancel)) foreach(Track track in tracks.TakeWhile(_ => !_cancel))
{ {
doneSectors = 0; doneSectors = 0;
ulong trackSectors = track.EndSector - track.StartSector + 1; 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). foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
TakeWhile(tag => useLong && !_cancel)) TakeWhile(_ => useLong && !_cancel))
{ {
switch(tag) switch(tag)
{ {
@@ -1470,7 +1470,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag)) if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
continue; continue;
foreach(Track track in tracks.TakeWhile(track => !_cancel)) foreach(Track track in tracks.TakeWhile(_ => !_cancel))
{ {
doneSectors = 0; doneSectors = 0;
ulong trackSectors = track.EndSector - track.StartSector + 1; ulong trackSectors = track.EndSector - track.StartSector + 1;

View File

@@ -346,7 +346,7 @@ public sealed class MainWindowViewModel : ViewModelBase
var imageEntropyWindow = new ImageEntropy(); var imageEntropyWindow = new ImageEntropy();
imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow); imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow);
imageEntropyWindow.Closed += (sender, args) => imageEntropyWindow = null; imageEntropyWindow.Closed += (_, _) => imageEntropyWindow = null;
imageEntropyWindow.Show(); imageEntropyWindow.Show();
} }
@@ -359,7 +359,7 @@ public sealed class MainWindowViewModel : ViewModelBase
var imageVerifyWindow = new ImageVerify(); var imageVerifyWindow = new ImageVerify();
imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow); imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow);
imageVerifyWindow.Closed += (sender, args) => imageVerifyWindow = null; imageVerifyWindow.Closed += (_, _) => imageVerifyWindow = null;
imageVerifyWindow.Show(); imageVerifyWindow.Show();
} }
@@ -372,7 +372,7 @@ public sealed class MainWindowViewModel : ViewModelBase
var imageChecksumWindow = new ImageChecksum(); var imageChecksumWindow = new ImageChecksum();
imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow); imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow);
imageChecksumWindow.Closed += (sender, args) => imageChecksumWindow = null; imageChecksumWindow.Closed += (_, _) => imageChecksumWindow = null;
imageChecksumWindow.Show(); imageChecksumWindow.Show();
} }
@@ -387,7 +387,7 @@ public sealed class MainWindowViewModel : ViewModelBase
imageConvertWindow.DataContext = imageConvertWindow.DataContext =
new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow); new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow);
imageConvertWindow.Closed += (sender, args) => imageConvertWindow = null; imageConvertWindow.Closed += (_, _) => imageConvertWindow = null;
imageConvertWindow.Show(); imageConvertWindow.Show();
} }

View File

@@ -953,7 +953,7 @@ public sealed partial class CloneCd
buffer = null; buffer = null;
foreach(KeyValuePair<uint, ulong> kvp in _offsetMap.Where(kvp => sectorAddress >= kvp.Value). foreach(KeyValuePair<uint, ulong> kvp in _offsetMap.Where(kvp => sectorAddress >= kvp.Value).
SelectMany(kvp => Tracks, (kvp, track) => new SelectMany(_ => Tracks, (kvp, track) => new
{ {
kvp, kvp,
track track

View File

@@ -32,8 +32,11 @@
namespace Aaru.DiscImages; namespace Aaru.DiscImages;
using System.Diagnostics.CodeAnalysis;
public sealed partial class Imd public sealed partial class Imd
{ {
[SuppressMessage("ReSharper", "UnusedMember.Local")]
enum TransferRate : byte enum TransferRate : byte
{ {
/// <summary>500 kbps in FM mode</summary> /// <summary>500 kbps in FM mode</summary>

View File

@@ -84,7 +84,7 @@ public sealed partial class Ndif
_imageInfo.Sectors = 0; _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) if(bcem.Length < 128)
return ErrorNumber.InvalidArgument; return ErrorNumber.InvalidArgument;
@@ -362,7 +362,6 @@ public sealed partial class Ndif
var cmpBuffer = new byte[currentChunk.length]; var cmpBuffer = new byte[currentChunk.length];
_imageStream.Seek(currentChunk.offset, SeekOrigin.Begin); _imageStream.Seek(currentChunk.offset, SeekOrigin.Begin);
_imageStream.Read(cmpBuffer, 0, cmpBuffer.Length); _imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
var cmpMs = new MemoryStream(cmpBuffer);
int realSize; int realSize;
switch(currentChunk.type) switch(currentChunk.type)

View File

@@ -288,7 +288,7 @@ public abstract class OpticalMediaImageTest : BaseMediaImageTest
Assert.Multiple(() => Assert.Multiple(() =>
{ {
Parallel.For(0L, Tests.Length, (i, state) => Parallel.For(0L, Tests.Length, (i, _) =>
{ {
string testFile = Tests[i].TestFile; string testFile = Tests[i].TestFile;

View File

@@ -237,7 +237,7 @@ public abstract class OpticalImageConvertIssueTest
subchannelExtents.Add((int)s); 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) switch(tag)
{ {

View File

@@ -305,7 +305,7 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
} }
foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t). foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
TakeWhile(tag => useLong)) TakeWhile(_ => useLong))
{ {
switch(tag) switch(tag)
{ {

View File

@@ -1013,7 +1013,7 @@ sealed class ConvertImageCommand : Command
subchannelExtents.Add((int)s); 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) switch(tag)
{ {
@@ -1411,7 +1411,7 @@ sealed class ConvertImageCommand : Command
mediaTask.StopTask(); mediaTask.StopTask();
foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.TakeWhile(tag => useLong)) foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.TakeWhile(_ => useLong))
{ {
switch(tag) switch(tag)
{ {

View File

@@ -750,7 +750,7 @@ sealed class DumpMediaCommand : Command
_progressTask2.MaxValue = maximum; _progressTask2.MaxValue = maximum;
}; };
Console.CancelKeyPress += (sender, e) => Console.CancelKeyPress += (_, e) =>
{ {
e.Cancel = true; e.Cancel = true;
dumper.Abort(); dumper.Abort();