From dea49e235dd774322a337bdeb31d0ecc4d7d4a3b Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 24 Nov 2025 19:09:00 +0000 Subject: [PATCH] [Refactor] Inline out variable declaration. --- Aaru.Core/Devices/Report/MMC.cs | 30 ++++++++++---- Aaru.Core/Devices/Report/Scsi.cs | 45 +++++++++++++++++---- Aaru.Devices/Device/ScsiCommands/SyQuest.cs | 6 +-- Aaru/Commands/Device/DeviceReport.cs | 40 +++++++++--------- Aaru/Commands/Image/Convert.cs | 3 +- 5 files changed, 82 insertions(+), 42 deletions(-) diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs index 3bf3f1294..570f4c6af 100644 --- a/Aaru.Core/Devices/Report/MMC.cs +++ b/Aaru.Core/Devices/Report/MMC.cs @@ -2650,9 +2650,17 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { - ReadOnlySpan localSense; ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate(); - sense = _dev.ReadLong10(out buffer, out localSense, false, false, 16, 0xFFFF, _dev.Timeout, out _); + + sense = _dev.ReadLong10(out buffer, + out ReadOnlySpan localSense, + false, + false, + 16, + 0xFFFF, + _dev.Timeout, + out _); + senseBytes = localSense.ToArray(); }); @@ -2847,10 +2855,13 @@ public sealed partial class DeviceReport if(!triedLba0) return; - ReadOnlySpan localSense; - mediaTest.CanReadF1_06 = - !_dev.MediaTekReadDram(out buffer, out localSense, 0, 0xB00, _dev.Timeout, out _); + !_dev.MediaTekReadDram(out buffer, + out ReadOnlySpan localSense, + 0, + 0xB00, + _dev.Timeout, + out _); mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : localSense.ToArray(); @@ -2993,10 +3004,13 @@ public sealed partial class DeviceReport if(!triedLeadOut) return; - ReadOnlySpan localSense; - mediaTest.CanReadF1_06LeadOut = - !_dev.MediaTekReadDram(out buffer, out localSense, 0, 0xB00, _dev.Timeout, out _); + !_dev.MediaTekReadDram(out buffer, + out ReadOnlySpan localSense, + 0, + 0xB00, + _dev.Timeout, + out _); mediaTest.ReadF1_06LeadOutData = mediaTest.CanReadF1_06LeadOut == true ? buffer : localSense.ToArray(); diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs index 9862d3638..0763bd02a 100644 --- a/Aaru.Core/Devices/Report/Scsi.cs +++ b/Aaru.Core/Devices/Report/Scsi.cs @@ -675,9 +675,17 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { - ReadOnlySpan localSense; ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate(); - sense = _dev.ReadLong10(out buffer, out localSense, false, false, 0, 0xFFFF, _dev.Timeout, out _); + + sense = _dev.ReadLong10(out buffer, + out ReadOnlySpan localSense, + false, + false, + 0, + 0xFFFF, + _dev.Timeout, + out _); + senseBytes = localSense.ToArray(); }); @@ -707,9 +715,15 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { - ReadOnlySpan localSense; ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_16).IsIndeterminate(); - sense = _dev.ReadLong16(out buffer, out localSense, false, 0, 0xFFFF, _dev.Timeout, out _); + + sense = _dev.ReadLong16(out buffer, + out ReadOnlySpan localSense, + false, + 0, + 0xFFFF, + _dev.Timeout, + out _); if(sense && !_dev.Error) { @@ -1059,9 +1073,17 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { - ReadOnlySpan localSense; ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_10).IsIndeterminate(); - sense = _dev.ReadLong10(out buffer, out localSense, false, false, 0, 0xFFFF, _dev.Timeout, out _); + + sense = _dev.ReadLong10(out buffer, + out ReadOnlySpan localSense, + false, + false, + 0, + 0xFFFF, + _dev.Timeout, + out _); + senseBytes = localSense.ToArray(); }); @@ -1091,9 +1113,16 @@ public sealed partial class DeviceReport Spectre.ProgressSingleSpinner(ctx => { - ReadOnlySpan localSense; ctx.AddTask(Localization.Core.Trying_SCSI_READ_LONG_16).IsIndeterminate(); - sense = _dev.ReadLong16(out buffer, out localSense, false, 0, 0xFFFF, _dev.Timeout, out _); + + sense = _dev.ReadLong16(out buffer, + out ReadOnlySpan localSense, + false, + 0, + 0xFFFF, + _dev.Timeout, + out _); + senseBytes = localSense.ToArray(); }); diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs index 0d8f0c808..9b6486029 100644 --- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs +++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs @@ -80,7 +80,6 @@ public partial class Device senseBuffer = SenseBuffer; Span cdb = CdbBuffer[..6]; cdb.Clear(); - bool sense; cdb[0] = (byte)ScsiCommands.Read6; cdb[1] = (byte)((lba & 0x1F0000) >> 16); @@ -103,7 +102,7 @@ public partial class Device buffer = []; LastError = !inhibitDma - ? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out sense) + ? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out bool sense) : SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.None, out duration, out sense); Error = LastError != 0; @@ -151,7 +150,6 @@ public partial class Device senseBuffer = SenseBuffer; Span cdb = CdbBuffer[..10]; cdb.Clear(); - bool sense; cdb[0] = (byte)ScsiCommands.Read10; cdb[2] = (byte)((lba & 0xFF000000) >> 24); @@ -176,7 +174,7 @@ public partial class Device buffer = []; LastError = !inhibitDma - ? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out sense) + ? SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.In, out duration, out bool sense) : SendScsiCommand(cdb, ref buffer, timeout, ScsiDirection.None, out duration, out sense); Error = LastError != 0; diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs index 7479b0bce..21180daad 100644 --- a/Aaru/Commands/Device/DeviceReport.cs +++ b/Aaru/Commands/Device/DeviceReport.cs @@ -725,11 +725,11 @@ sealed class DeviceReportCommand : AsyncCommand .StartAsync(Localization.Core.Waiting_for_drive_to_become_ready, async ctx => { - ReadOnlySpan localSense; - - sense = dev.ScsiTestUnitReady(out localSense, - dev.Timeout, - out _); + sense = + dev.ScsiTestUnitReady(out ReadOnlySpan + localSense, + dev.Timeout, + out _); if(!sense) return; @@ -941,11 +941,11 @@ sealed class DeviceReportCommand : AsyncCommand .StartAsync(Localization.Core.Waiting_for_drive_to_become_ready, async ctx => { - ReadOnlySpan localSense; - - sense = dev.ScsiTestUnitReady(out localSense, - dev.Timeout, - out _); + sense = + dev.ScsiTestUnitReady(out ReadOnlySpan + localSense, + dev.Timeout, + out _); AaruLogging.Debug(MODULE_NAME, "sense = {0}", sense); @@ -1060,11 +1060,11 @@ sealed class DeviceReportCommand : AsyncCommand .StartAsync(Localization.Core.Waiting_for_drive_to_become_ready, async ctx => { - ReadOnlySpan localSense; - - sense = dev.ScsiTestUnitReady(out localSense, - dev.Timeout, - out _); + sense = + dev.ScsiTestUnitReady(out ReadOnlySpan + localSense, + dev.Timeout, + out _); if(!sense) return; @@ -1276,11 +1276,11 @@ sealed class DeviceReportCommand : AsyncCommand .StartAsync(Localization.Core.Waiting_for_drive_to_become_ready, async ctx => { - ReadOnlySpan localSense; - - sense = dev.ScsiTestUnitReady(out localSense, - dev.Timeout, - out _); + sense = + dev.ScsiTestUnitReady(out ReadOnlySpan + localSense, + dev.Timeout, + out _); if(!sense) return; diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs index f2696dbc1..99020b27b 100644 --- a/Aaru/Commands/Image/Convert.cs +++ b/Aaru/Commands/Image/Convert.cs @@ -253,10 +253,9 @@ sealed class ConvertImageCommand : Command if(mediaCapabilityResult != (int)ErrorNumber.NoError) return mediaCapabilityResult; // Validate sector tags compatibility between formats - bool useLong; int sectorTagValidationResult = - ValidateSectorTags(outputFormat as IWritableImage, inputFormat, settings, out useLong); + ValidateSectorTags(outputFormat as IWritableImage, inputFormat, settings, out bool useLong); if(sectorTagValidationResult != (int)ErrorNumber.NoError) return sectorTagValidationResult;