diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs index 0d2e7c12f..0dc431e59 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs @@ -71,8 +71,6 @@ partial class Dump return sense; } - byte[] subBuf; - uint subSize = supportedPlextorSubchannel == PlextorSubchannel.Q16 ? 16u : 96u; if(supportedPlextorSubchannel is PlextorSubchannel.Q16 or PlextorSubchannel.Pack) @@ -94,7 +92,7 @@ partial class Dump if(sense) return true; - sense = _dev.PlextorReadCdDa(out subBuf, out senseBuf, firstSectorToRead, subSize, blocksToRead, + sense = _dev.PlextorReadCdDa(out byte[] subBuf, out senseBuf, firstSectorToRead, subSize, blocksToRead, supportedPlextorSubchannel == PlextorSubchannel.Pack ? PlextorSubchannel.All : supportedPlextorSubchannel, 0, out cmdDuration); diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs index 8c151f43c..89fb4eab8 100644 --- a/Aaru.Core/Devices/Dumping/MiniDisc.cs +++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs @@ -71,7 +71,6 @@ partial class Dump byte[] readBuffer; Modes.DecodedMode? decMode = null; Dictionary mediaTags = new(); - byte[] cmdBuf; bool ret; if(_outputPlugin is not IWritableImage outputFormat) @@ -89,7 +88,7 @@ partial class Dump _dumpLog.WriteLine("Requesting MODE SENSE (6)."); UpdateStatus?.Invoke("Requesting MODE SENSE (6)."); - sense = _dev.ModeSense6(out cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x3F, 5, out _); + sense = _dev.ModeSense6(out byte[] cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x3F, 5, out _); if(!sense && !_dev.Error && diff --git a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs index 62f321c71..53f60a7c3 100644 --- a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs @@ -388,9 +388,7 @@ partial class Dump { if(outputFormat is IWritableOpticalImage opticalPlugin) { - byte[] readBuffer; - - sense = _dev.ReadDiscInformation(out readBuffer, out _, MmcDiscInformationDataTypes.DiscInformation, + sense = _dev.ReadDiscInformation(out byte[] readBuffer, out _, MmcDiscInformationDataTypes.DiscInformation, _dev.Timeout, out _); if(!sense) diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs index 7f61b8c8e..931eecf92 100644 --- a/Aaru.Core/Devices/Report/Scsi.cs +++ b/Aaru.Core/Devices/Report/Scsi.cs @@ -221,8 +221,6 @@ public sealed partial class DeviceReport { Modes.DecodedMode? decMode = null; PeripheralDeviceTypes devType = _dev.ScsiType; - byte[] mode10Buffer; - byte[] mode6Buffer; bool sense; mediumType = 0; @@ -240,7 +238,7 @@ public sealed partial class DeviceReport { var saveBuffer = false; - sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, pageControl, 0x3F, 0xFF, _dev.Timeout, + sense = _dev.ModeSense10(out byte[] mode10Buffer, out _, false, true, pageControl, 0x3F, 0xFF, _dev.Timeout, out _); if(sense || _dev.Error) @@ -321,7 +319,7 @@ public sealed partial class DeviceReport }) { var saveBuffer = false; - sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x3F, 0xFF, _dev.Timeout, out _); + sense = _dev.ModeSense6(out byte[] mode6Buffer, out _, true, pageControl, 0x3F, 0xFF, _dev.Timeout, out _); if(sense || _dev.Error) { diff --git a/Aaru.Core/Media/CompactDisc.cs b/Aaru.Core/Media/CompactDisc.cs index 02d39bca4..1df14aad2 100644 --- a/Aaru.Core/Media/CompactDisc.cs +++ b/Aaru.Core/Media/CompactDisc.cs @@ -1606,7 +1606,6 @@ public static class CompactDisc foreach(int sector in subchannelExtents) { Track track = tracks.LastOrDefault(t => (int)t.StartSector <= sector); - byte trkFlags; byte flags; ulong trackStart; ulong pregap; @@ -1627,7 +1626,7 @@ public static class CompactDisc pregap = track.Pregap; } - if(!trackFlags.TryGetValue((byte)(track?.Sequence ?? 0), out trkFlags) && + if(!trackFlags.TryGetValue((byte)(track?.Sequence ?? 0), out byte trkFlags) && track?.Type != TrackType.Audio) flags = (byte)CdFlags.DataTrack; else diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs index 33b9e5e34..3bcfdf41d 100644 --- a/Aaru.Core/Media/Detection/MMC.cs +++ b/Aaru.Core/Media/Detection/MMC.cs @@ -293,7 +293,6 @@ public static class MMC { uint startOfFirstDataTrack = uint.MaxValue; DI.DiscInformation? blurayDi = null; - byte[] cmdBuf; bool sense; byte secondSessionFirstTrack = 0; byte[] sector0; @@ -309,7 +308,7 @@ public static class MMC hiddenTrack = false; hiddenData = false; - sense = dev.GetConfiguration(out cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout, out _); + sense = dev.GetConfiguration(out byte[] cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout, out _); if(!sense) { diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs index 47577030d..d3a2a45ef 100644 --- a/Aaru.Core/Sidecar/OpticalDisc.cs +++ b/Aaru.Core/Sidecar/OpticalDisc.cs @@ -299,9 +299,7 @@ public sealed partial class Sidecar xmlTrk.StartSector = trk.StartSector; xmlTrk.EndSector = trk.EndSector; - int idx0; - - if(trk.Indexes?.TryGetValue(0, out idx0) == true && + if(trk.Indexes?.TryGetValue(0, out int idx0) == true && idx0 >= 0) xmlTrk.StartSector = (ulong)idx0; diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 137bbe1d7..7fb518f4e 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -969,10 +969,9 @@ public sealed partial class CdrWin if(leadouts.TryGetValue((byte)s, out int leadout)) { - int startSector; sessions[s - 1].EndSector = (ulong)(leadout - 1); - if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out startSector)) + if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out int startSector)) cueTracks[lastSessionTrack].Indexes.TryGetValue(1, out startSector); cueTracks[lastSessionTrack].Sectors = (ulong)(leadout - startSector); diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs index 1ac40e371..c5ec1851d 100644 --- a/Aaru.Images/WCDiskImage/Read.cs +++ b/Aaru.Images/WCDiskImage/Read.cs @@ -268,8 +268,7 @@ public sealed partial class WCDiskImage case SectorFlag.Normal: /* read a normal sector and store it in cache */ stream.Read(sectorData, 0, 512); _sectorCache[(cyl, head, sect)] = sectorData; - byte[] crc; - CRC16IBMContext.Data(sectorData, 512, out crc); + CRC16IBMContext.Data(sectorData, 512, out byte[] crc); var calculatedCRC = (short)((256 * crc[0]) | crc[1]); /* AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: Regular sector, stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}", diff --git a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs index acd538e0d..f37700b31 100644 --- a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs +++ b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs @@ -13,10 +13,8 @@ static partial class ScsiMmc { static void CheckGdromReadability(string devPath, Device dev) { - int item; var tocIsNotBcd = false; bool sense; - byte[] buffer; byte[] senseBuffer; start: @@ -54,7 +52,7 @@ static partial class ScsiMmc Thread.Sleep(2000); } while(retries < 25); - sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _); + sense = dev.ReadRawToc(out byte[] buffer, out senseBuffer, 1, dev.Timeout, out _); if(sense) { @@ -410,7 +408,7 @@ static partial class ScsiMmc string strDev = Console.ReadLine(); - if(!int.TryParse(strDev, out item)) + if(!int.TryParse(strDev, out int item)) { AaruConsole.WriteLine("Not a number. Press any key to continue..."); Console.ReadKey(); diff --git a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs index 8554096d7..86fa0bf15 100644 --- a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs +++ b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs @@ -13,10 +13,8 @@ static partial class ScsiMmc { static void ReadLeadOutUsingTrapDisc(string devPath, Device dev) { - int item; var tocIsNotBcd = false; bool sense; - byte[] buffer; byte[] senseBuffer; start: @@ -54,7 +52,7 @@ static partial class ScsiMmc Thread.Sleep(2000); } while(retries < 25); - sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _); + sense = dev.ReadRawToc(out byte[] buffer, out senseBuffer, 1, dev.Timeout, out _); if(sense) { @@ -399,7 +397,7 @@ static partial class ScsiMmc string strDev = Console.ReadLine(); - if(!int.TryParse(strDev, out item)) + if(!int.TryParse(strDev, out int item)) { AaruConsole.WriteLine("Not a number. Press any key to continue..."); Console.ReadKey();