diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs index e5128f104..897f72deb 100644 --- a/Aaru.Core/ImageInfo.cs +++ b/Aaru.Core/ImageInfo.cs @@ -354,7 +354,7 @@ public static class ImageInfo } AaruLogging.WriteLine(Localization.Core.SCSI_INQUIRY_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Inquiry.Prettify(inquiry)); + AaruLogging.Write(Inquiry.Prettify(inquiry)); AaruLogging.WriteLine(); } } @@ -367,7 +367,7 @@ public static class ImageInfo { AaruLogging.WriteLine(Localization.Core.ATA_IDENTIFY_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Identify.Prettify(identify)); + AaruLogging.Write(Identify.Prettify(identify)); AaruLogging.WriteLine(); } } @@ -380,7 +380,7 @@ public static class ImageInfo { AaruLogging.WriteLine(Localization.Core.ATAPI_IDENTIFY_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Identify.Prettify(identify)); + AaruLogging.Write(Identify.Prettify(identify)); AaruLogging.WriteLine(); } } @@ -424,7 +424,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { - AaruLogging.Write("{0}", Modes.PrettifyModePage_2A(mode2A)); + AaruLogging.Write(Modes.PrettifyModePage_2A(mode2A)); AaruLogging.WriteLine(); } } @@ -447,7 +447,7 @@ public static class ImageInfo } AaruLogging.WriteLine(Localization.Core.CompactDisc_Table_of_Contents_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", FullTOC.Prettify(toc)); + AaruLogging.Write(FullTOC.Prettify(toc)); AaruLogging.WriteLine(); } } @@ -471,7 +471,7 @@ public static class ImageInfo AaruLogging.WriteLine(Localization.Core.CompactDisc_Program_Memory_Area_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", PMA.Prettify(pma)); + AaruLogging.Write(PMA.Prettify(pma)); AaruLogging.WriteLine(); } } @@ -498,7 +498,7 @@ public static class ImageInfo AaruLogging.WriteLine(Localization.Core .CompactDisc_Absolute_Time_In_Pregroove_ATIP_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", ATIP.Prettify(atip)); + AaruLogging.Write(ATIP.Prettify(atip)); AaruLogging.WriteLine(); } } @@ -523,7 +523,7 @@ public static class ImageInfo } AaruLogging.WriteLine(Localization.Core.CompactDisc_Lead_in_CD_Text_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", CDTextOnLeadIn.Prettify(cdtext)); + AaruLogging.Write(CDTextOnLeadIn.Prettify(cdtext)); AaruLogging.WriteLine(); } } @@ -549,7 +549,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.DVD_RW_Pre_Recorded_Information_WithMarkup); - AaruLogging.Write("{0}", PRI.Prettify(pri)); + AaruLogging.Write(PRI.Prettify(pri)); AaruLogging.WriteLine(); } } @@ -561,7 +561,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.DVD_Physical_Format_Information_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType)); + AaruLogging.Write(PFI.Prettify(pfi, imageFormat.Info.MediaType)); AaruLogging.WriteLine(); } } @@ -575,7 +575,7 @@ public static class ImageInfo AaruLogging.WriteLine(Localization.Core .DVD_RAM_Disc_Definition_Structure_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", DDS.Prettify(dds)); + AaruLogging.Write(DDS.Prettify(dds)); AaruLogging.WriteLine(); } } @@ -589,7 +589,7 @@ public static class ImageInfo AaruLogging.WriteLine(Localization.Core .DVD_R_Physical_Format_Information_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", PFI.Prettify(pfi, imageFormat.Info.MediaType)); + AaruLogging.Write(PFI.Prettify(pfi, imageFormat.Info.MediaType)); AaruLogging.WriteLine(); } } @@ -601,7 +601,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.Bluray_Disc_Information_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", DI.Prettify(di)); + AaruLogging.Write(DI.Prettify(di)); AaruLogging.WriteLine(); } } @@ -613,7 +613,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.Bluray_Disc_Definition_Structure_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.Bluray.DDS.Prettify(dds)); + AaruLogging.Write(Decoders.Bluray.DDS.Prettify(dds)); AaruLogging.WriteLine(); } } @@ -638,15 +638,15 @@ public static class ImageInfo break; case TupleCodes.CISTPL_DEVICEGEO: case TupleCodes.CISTPL_DEVICEGEO_A: - AaruLogging.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyDeviceGeometryTuple(tuple)); break; case TupleCodes.CISTPL_MANFID: - AaruLogging.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyManufacturerIdentificationTuple(tuple)); break; case TupleCodes.CISTPL_VERS_1: - AaruLogging.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyLevel1VersionTuple(tuple)); break; case TupleCodes.CISTPL_ALTSTR: @@ -709,7 +709,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.SecureDigital_CID_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(cid)); + AaruLogging.Write(Decoders.SecureDigital.Decoders.PrettifyCID(cid)); AaruLogging.WriteLine(); } } @@ -721,7 +721,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.SecureDigital_CSD_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(csd)); + AaruLogging.Write(Decoders.SecureDigital.Decoders.PrettifyCSD(csd)); AaruLogging.WriteLine(); } } @@ -733,7 +733,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.SecureDigital_SCR_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(scr)); + AaruLogging.Write(Decoders.SecureDigital.Decoders.PrettifySCR(scr)); AaruLogging.WriteLine(); } } @@ -745,7 +745,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.SecureDigital_OCR_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(ocr)); + AaruLogging.Write(Decoders.SecureDigital.Decoders.PrettifyOCR(ocr)); AaruLogging.WriteLine(); } } @@ -757,7 +757,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.MultiMediaCard_CID_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyCID(cid)); + AaruLogging.Write(Decoders.MMC.Decoders.PrettifyCID(cid)); AaruLogging.WriteLine(); } } @@ -769,7 +769,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.MultiMediaCard_CSD_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyCSD(csd)); + AaruLogging.Write(Decoders.MMC.Decoders.PrettifyCSD(csd)); AaruLogging.WriteLine(); } } @@ -781,7 +781,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.MultiMediaCard_Extended_CSD_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd)); + AaruLogging.Write(Decoders.MMC.Decoders.PrettifyExtendedCSD(ecsd)); AaruLogging.WriteLine(); } } @@ -793,7 +793,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.MultiMediaCard_OCR_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", Decoders.MMC.Decoders.PrettifyOCR(ocr)); + AaruLogging.Write(Decoders.MMC.Decoders.PrettifyOCR(ocr)); AaruLogging.WriteLine(); } } @@ -805,7 +805,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.Xbox_Physical_Format_Information_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", PFI.Prettify(xpfi, imageFormat.Info.MediaType)); + AaruLogging.Write(PFI.Prettify(xpfi, imageFormat.Info.MediaType)); AaruLogging.WriteLine(); } } @@ -823,7 +823,7 @@ public static class ImageInfo if(xmi.HasValue) { AaruLogging.WriteLine(Localization.Core.Xbox_DMI_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", DMI.PrettifyXbox(xmi)); + AaruLogging.Write(DMI.PrettifyXbox(xmi)); AaruLogging.WriteLine(); } } @@ -835,7 +835,7 @@ public static class ImageInfo if(xmi.HasValue) { AaruLogging.WriteLine(Localization.Core.Xbox_360_DMI_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", DMI.PrettifyXbox360(xmi)); + AaruLogging.Write(DMI.PrettifyXbox360(xmi)); AaruLogging.WriteLine(); } } @@ -849,7 +849,7 @@ public static class ImageInfo if(errno == ErrorNumber.NoError) { AaruLogging.WriteLine(Localization.Core.Xbox_Security_Sectors_contained_in_image_WithMarkup); - AaruLogging.Write("{0}", SS.Prettify(toc)); + AaruLogging.Write(SS.Prettify(toc)); AaruLogging.WriteLine(); } } diff --git a/Aaru.Tests.Devices/ATA/Ata28.cs b/Aaru.Tests.Devices/ATA/Ata28.cs index 789d1fc5e..5eb950129 100644 --- a/Aaru.Tests.Devices/ATA/Ata28.cs +++ b/Aaru.Tests.Devices/ATA/Ata28.cs @@ -185,7 +185,7 @@ static class Ata28 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_BUFFER_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -262,7 +262,7 @@ static class Ata28 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_BUFFER_DMA_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -432,7 +432,7 @@ static class Ata28 ? Localization.READ_DMA_WITH_RETRIES_status_registers : Localization.READ_DMA_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -604,7 +604,7 @@ static class Ata28 ? Localization.READ_LONG_WITH_RETRIES_status_registers : Localization.READ_LONG_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -760,7 +760,7 @@ static class Ata28 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_MULTIPLE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -824,7 +824,7 @@ static class Ata28 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_NATIVE_MAX_ADDRESS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -994,7 +994,7 @@ static class Ata28 ? Localization.READ_SECTORS_WITH_RETRIES_status_registers : Localization.READ_SECTORS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1116,7 +1116,7 @@ static class Ata28 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEEK_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs index 0b4c2879e..02ec01bf4 100644 --- a/Aaru.Tests.Devices/ATA/Ata48.cs +++ b/Aaru.Tests.Devices/ATA/Ata48.cs @@ -150,7 +150,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_NATIVE_MAX_ADDRESS_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -304,7 +304,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DMA_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -466,7 +466,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LOG_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -628,7 +628,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LOG_DMA_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -784,7 +784,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_MULTIPLE_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -848,7 +848,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_NATIVE_MAX_ADDRESS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1002,7 +1002,7 @@ static class Ata48 Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_SECTORS_EXT_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/ATA/AtaCHS.cs b/Aaru.Tests.Devices/ATA/AtaCHS.cs index f2dca3a0f..2bfb611c3 100644 --- a/Aaru.Tests.Devices/ATA/AtaCHS.cs +++ b/Aaru.Tests.Devices/ATA/AtaCHS.cs @@ -179,7 +179,7 @@ static class AtaChs AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.IDENTIFY_DEVICE_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.ATA.Identify.Prettify(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -191,7 +191,7 @@ static class AtaChs Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.IDENTIFY_DEVICE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -388,7 +388,7 @@ static class AtaChs ? Localization.READ_DMA_WITH_RETRIES_status_registers : Localization.READ_DMA_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -587,7 +587,7 @@ static class AtaChs ? Localization.READ_LONG_WITH_RETRIES_status_registers : Localization.READ_LONG_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -770,7 +770,7 @@ static class AtaChs Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_MULTIPLE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -969,7 +969,7 @@ static class AtaChs ? Localization.READ_SECTORS_WITH_RETRIES_status_registers : Localization.READ_SECTORS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1120,7 +1120,7 @@ static class AtaChs Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEEK_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1295,7 +1295,7 @@ static class AtaChs Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SET_FEATURES_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/ATA/Atapi.cs b/Aaru.Tests.Devices/ATA/Atapi.cs index 31be47628..f8fe3e682 100644 --- a/Aaru.Tests.Devices/ATA/Atapi.cs +++ b/Aaru.Tests.Devices/ATA/Atapi.cs @@ -134,7 +134,7 @@ static class Atapi AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.IDENTIFY_PACKET_DEVICE_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.ATA.Identify.Prettify(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -146,7 +146,7 @@ static class Atapi Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.IDENTIFY_PACKET_DEVICE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/ATA/Cfa.cs b/Aaru.Tests.Devices/ATA/Cfa.cs index 6c8c05636..32556e214 100644 --- a/Aaru.Tests.Devices/ATA/Cfa.cs +++ b/Aaru.Tests.Devices/ATA/Cfa.cs @@ -130,7 +130,7 @@ static class Cfa Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.REQUEST_EXTENDED_ERROR_CODE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -296,7 +296,7 @@ static class Cfa Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.TRANSLATE_SECTOR_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -439,7 +439,7 @@ static class Cfa Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.TRANSLATE_SECTOR_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/ATA/MCPT.cs b/Aaru.Tests.Devices/ATA/MCPT.cs index b9e264c49..95193ae5d 100644 --- a/Aaru.Tests.Devices/ATA/MCPT.cs +++ b/Aaru.Tests.Devices/ATA/MCPT.cs @@ -142,7 +142,7 @@ static class Mcpt AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.CHECK_MEDIA_CARD_TYPE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); diff --git a/Aaru.Tests.Devices/ATA/Smart.cs b/Aaru.Tests.Devices/ATA/Smart.cs index 067d7a847..f3ec1ea23 100644 --- a/Aaru.Tests.Devices/ATA/Smart.cs +++ b/Aaru.Tests.Devices/ATA/Smart.cs @@ -127,7 +127,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.DISABLE_ATTRIBUTE_AUTOSAVE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -174,7 +174,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.DISABLE_OPERATIONS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -225,7 +225,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.ENABLE_ATTRIBUTE_AUTOSAVE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -272,7 +272,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.ENABLE_OPERATIONS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -374,7 +374,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.EXECUTE_OFF_LINE_IMMEDIATE_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -471,7 +471,7 @@ static class Smart Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DATA_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -601,7 +601,7 @@ static class Smart Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LOG_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -634,7 +634,7 @@ static class Smart AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.RETURN_STATUS_status_registers); - AaruLogging.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters)); + AaruLogging.Write(MainClass.DecodeAtaRegisters(errorRegisters)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); diff --git a/Aaru.Tests.Devices/SCSI/Adaptec.cs b/Aaru.Tests.Devices/SCSI/Adaptec.cs index 564df623a..f9b566fe2 100644 --- a/Aaru.Tests.Devices/SCSI/Adaptec.cs +++ b/Aaru.Tests.Devices/SCSI/Adaptec.cs @@ -93,7 +93,7 @@ static class Adaptec static void ReadResetUsageCounter(string devPath, Device dev) { - bool drive1 = false; + var drive1 = false; string strDev; int item; @@ -222,7 +222,7 @@ static class Adaptec Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_RESET_USAGE_COUNTER_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -320,7 +320,7 @@ static class Adaptec Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DATA_BUFFER_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -340,7 +340,7 @@ static class Adaptec static void SetErrorThreshold(string devPath, Device dev) { - bool drive1 = false; + var drive1 = false; byte threshold = 0; string strDev; int item; @@ -425,7 +425,7 @@ static class Adaptec AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.SET_ERROR_THRESHOLD_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -479,7 +479,7 @@ static class Adaptec static void Translate(string devPath, Device dev) { - bool drive1 = false; + var drive1 = false; uint lba = 0; string strDev; int item; @@ -623,7 +623,7 @@ static class Adaptec Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.TRANSLATE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs index abdd92b11..fd6139604 100644 --- a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs +++ b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs @@ -217,7 +217,7 @@ static class ArchiveCorp Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.ArchiveCorp_RequestBlockAddress_REQUEST_BLOCK_ADDRESS_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -239,7 +239,7 @@ static class ArchiveCorp static void SeekBlock(string devPath, Device dev) { - bool immediate = false; + var immediate = false; uint lba = 0; string strDev; int item; @@ -325,7 +325,7 @@ static class ArchiveCorp AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.SEEK_BLOCK_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/Certance.cs b/Aaru.Tests.Devices/SCSI/Certance.cs index ff631ef3f..84d0b37fd 100644 --- a/Aaru.Tests.Devices/SCSI/Certance.cs +++ b/Aaru.Tests.Devices/SCSI/Certance.cs @@ -98,7 +98,7 @@ static class Certance AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.PARK_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -164,7 +164,7 @@ static class Certance AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.UNPARK_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/Fujitsu.cs b/Aaru.Tests.Devices/SCSI/Fujitsu.cs index ccf9d2894..e31ab6c94 100644 --- a/Aaru.Tests.Devices/SCSI/Fujitsu.cs +++ b/Aaru.Tests.Devices/SCSI/Fujitsu.cs @@ -78,10 +78,10 @@ static class Fujitsu static void Display(string devPath, Device dev) { - bool flash = false; + var flash = false; FujitsuDisplayModes mode = FujitsuDisplayModes.Ready; - string firstHalf = "AARUTEST"; - string secondHalf = "TESTAARU"; + var firstHalf = "AARUTEST"; + var secondHalf = "TESTAARU"; string strDev; int item; @@ -182,7 +182,7 @@ static class Fujitsu AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.DISPLAY_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs index 617679912..2272872d5 100644 --- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs +++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs @@ -224,7 +224,7 @@ static class HlDtSt Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DVD_RAW_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/HP.cs b/Aaru.Tests.Devices/SCSI/HP.cs index 09c64a4e4..251a73cda 100644 --- a/Aaru.Tests.Devices/SCSI/HP.cs +++ b/Aaru.Tests.Devices/SCSI/HP.cs @@ -78,12 +78,12 @@ static class Hp static void ReadLong(string devPath, Device dev) { - bool relative = false; + var relative = false; uint address = 0; ushort length = 1; ushort bps = 512; - bool physical = false; - bool sectorCount = true; + var physical = false; + var sectorCount = true; string strDev; int item; @@ -300,7 +300,7 @@ static class Hp Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LONG_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/Kreon.cs b/Aaru.Tests.Devices/SCSI/Kreon.cs index a35f73a67..4998b66d7 100644 --- a/Aaru.Tests.Devices/SCSI/Kreon.cs +++ b/Aaru.Tests.Devices/SCSI/Kreon.cs @@ -222,7 +222,7 @@ static class Kreon Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.EXTRACT_SS_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -264,7 +264,7 @@ static class Kreon AaruLogging.WriteLine(Localization.Features_0, features); AaruLogging.WriteLine(Localization.GET_FEATURE_LIST_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -383,7 +383,7 @@ static class Kreon AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.SET_LOCK_STATE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -438,7 +438,7 @@ static class Kreon AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.UNLOCK_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/MMC.cs b/Aaru.Tests.Devices/SCSI/MMC.cs index 9bd79168b..4572e9cec 100644 --- a/Aaru.Tests.Devices/SCSI/MMC.cs +++ b/Aaru.Tests.Devices/SCSI/MMC.cs @@ -271,292 +271,292 @@ static class Mmc switch(desc.Code) { case 0x0000: - AaruLogging.Write("{0}", Features.Prettify_0000(desc.Data)); + AaruLogging.Write(Features.Prettify_0000(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0001: - AaruLogging.Write("{0}", Features.Prettify_0001(desc.Data)); + AaruLogging.Write(Features.Prettify_0001(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0002: - AaruLogging.Write("{0}", Features.Prettify_0002(desc.Data)); + AaruLogging.Write(Features.Prettify_0002(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0003: - AaruLogging.Write("{0}", Features.Prettify_0003(desc.Data)); + AaruLogging.Write(Features.Prettify_0003(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0004: - AaruLogging.Write("{0}", Features.Prettify_0004(desc.Data)); + AaruLogging.Write(Features.Prettify_0004(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0010: - AaruLogging.Write("{0}", Features.Prettify_0010(desc.Data)); + AaruLogging.Write(Features.Prettify_0010(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x001D: - AaruLogging.Write("{0}", Features.Prettify_001D(desc.Data)); + AaruLogging.Write(Features.Prettify_001D(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x001E: - AaruLogging.Write("{0}", Features.Prettify_001E(desc.Data)); + AaruLogging.Write(Features.Prettify_001E(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x001F: - AaruLogging.Write("{0}", Features.Prettify_001F(desc.Data)); + AaruLogging.Write(Features.Prettify_001F(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0020: - AaruLogging.Write("{0}", Features.Prettify_0020(desc.Data)); + AaruLogging.Write(Features.Prettify_0020(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0021: - AaruLogging.Write("{0}", Features.Prettify_0021(desc.Data)); + AaruLogging.Write(Features.Prettify_0021(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0022: - AaruLogging.Write("{0}", Features.Prettify_0022(desc.Data)); + AaruLogging.Write(Features.Prettify_0022(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0023: - AaruLogging.Write("{0}", Features.Prettify_0023(desc.Data)); + AaruLogging.Write(Features.Prettify_0023(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0024: - AaruLogging.Write("{0}", Features.Prettify_0024(desc.Data)); + AaruLogging.Write(Features.Prettify_0024(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0025: - AaruLogging.Write("{0}", Features.Prettify_0025(desc.Data)); + AaruLogging.Write(Features.Prettify_0025(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0026: - AaruLogging.Write("{0}", Features.Prettify_0026(desc.Data)); + AaruLogging.Write(Features.Prettify_0026(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0027: - AaruLogging.Write("{0}", Features.Prettify_0027(desc.Data)); + AaruLogging.Write(Features.Prettify_0027(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0028: - AaruLogging.Write("{0}", Features.Prettify_0028(desc.Data)); + AaruLogging.Write(Features.Prettify_0028(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0029: - AaruLogging.Write("{0}", Features.Prettify_0029(desc.Data)); + AaruLogging.Write(Features.Prettify_0029(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002A: - AaruLogging.Write("{0}", Features.Prettify_002A(desc.Data)); + AaruLogging.Write(Features.Prettify_002A(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002B: - AaruLogging.Write("{0}", Features.Prettify_002B(desc.Data)); + AaruLogging.Write(Features.Prettify_002B(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002C: - AaruLogging.Write("{0}", Features.Prettify_002C(desc.Data)); + AaruLogging.Write(Features.Prettify_002C(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002D: - AaruLogging.Write("{0}", Features.Prettify_002D(desc.Data)); + AaruLogging.Write(Features.Prettify_002D(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002E: - AaruLogging.Write("{0}", Features.Prettify_002E(desc.Data)); + AaruLogging.Write(Features.Prettify_002E(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x002F: - AaruLogging.Write("{0}", Features.Prettify_002F(desc.Data)); + AaruLogging.Write(Features.Prettify_002F(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0030: - AaruLogging.Write("{0}", Features.Prettify_0030(desc.Data)); + AaruLogging.Write(Features.Prettify_0030(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0031: - AaruLogging.Write("{0}", Features.Prettify_0031(desc.Data)); + AaruLogging.Write(Features.Prettify_0031(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0032: - AaruLogging.Write("{0}", Features.Prettify_0032(desc.Data)); + AaruLogging.Write(Features.Prettify_0032(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0033: - AaruLogging.Write("{0}", Features.Prettify_0033(desc.Data)); + AaruLogging.Write(Features.Prettify_0033(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0035: - AaruLogging.Write("{0}", Features.Prettify_0035(desc.Data)); + AaruLogging.Write(Features.Prettify_0035(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0037: - AaruLogging.Write("{0}", Features.Prettify_0037(desc.Data)); + AaruLogging.Write(Features.Prettify_0037(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0038: - AaruLogging.Write("{0}", Features.Prettify_0038(desc.Data)); + AaruLogging.Write(Features.Prettify_0038(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x003A: - AaruLogging.Write("{0}", Features.Prettify_003A(desc.Data)); + AaruLogging.Write(Features.Prettify_003A(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x003B: - AaruLogging.Write("{0}", Features.Prettify_003B(desc.Data)); + AaruLogging.Write(Features.Prettify_003B(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0040: - AaruLogging.Write("{0}", Features.Prettify_0040(desc.Data)); + AaruLogging.Write(Features.Prettify_0040(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0041: - AaruLogging.Write("{0}", Features.Prettify_0041(desc.Data)); + AaruLogging.Write(Features.Prettify_0041(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0042: - AaruLogging.Write("{0}", Features.Prettify_0042(desc.Data)); + AaruLogging.Write(Features.Prettify_0042(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0050: - AaruLogging.Write("{0}", Features.Prettify_0050(desc.Data)); + AaruLogging.Write(Features.Prettify_0050(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0051: - AaruLogging.Write("{0}", Features.Prettify_0051(desc.Data)); + AaruLogging.Write(Features.Prettify_0051(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0080: - AaruLogging.Write("{0}", Features.Prettify_0080(desc.Data)); + AaruLogging.Write(Features.Prettify_0080(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0100: - AaruLogging.Write("{0}", Features.Prettify_0100(desc.Data)); + AaruLogging.Write(Features.Prettify_0100(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0101: - AaruLogging.Write("{0}", Features.Prettify_0101(desc.Data)); + AaruLogging.Write(Features.Prettify_0101(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0102: - AaruLogging.Write("{0}", Features.Prettify_0102(desc.Data)); + AaruLogging.Write(Features.Prettify_0102(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0103: - AaruLogging.Write("{0}", Features.Prettify_0103(desc.Data)); + AaruLogging.Write(Features.Prettify_0103(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0104: - AaruLogging.Write("{0}", Features.Prettify_0104(desc.Data)); + AaruLogging.Write(Features.Prettify_0104(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0105: - AaruLogging.Write("{0}", Features.Prettify_0105(desc.Data)); + AaruLogging.Write(Features.Prettify_0105(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0106: - AaruLogging.Write("{0}", Features.Prettify_0106(desc.Data)); + AaruLogging.Write(Features.Prettify_0106(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0107: - AaruLogging.Write("{0}", Features.Prettify_0107(desc.Data)); + AaruLogging.Write(Features.Prettify_0107(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0108: - AaruLogging.Write("{0}", Features.Prettify_0108(desc.Data)); + AaruLogging.Write(Features.Prettify_0108(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0109: - AaruLogging.Write("{0}", Features.Prettify_0109(desc.Data)); + AaruLogging.Write(Features.Prettify_0109(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x010A: - AaruLogging.Write("{0}", Features.Prettify_010A(desc.Data)); + AaruLogging.Write(Features.Prettify_010A(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x010B: - AaruLogging.Write("{0}", Features.Prettify_010B(desc.Data)); + AaruLogging.Write(Features.Prettify_010B(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x010C: - AaruLogging.Write("{0}", Features.Prettify_010C(desc.Data)); + AaruLogging.Write(Features.Prettify_010C(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x010D: - AaruLogging.Write("{0}", Features.Prettify_010D(desc.Data)); + AaruLogging.Write(Features.Prettify_010D(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x010E: - AaruLogging.Write("{0}", Features.Prettify_010E(desc.Data)); + AaruLogging.Write(Features.Prettify_010E(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0110: - AaruLogging.Write("{0}", Features.Prettify_0110(desc.Data)); + AaruLogging.Write(Features.Prettify_0110(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0113: - AaruLogging.Write("{0}", Features.Prettify_0113(desc.Data)); + AaruLogging.Write(Features.Prettify_0113(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; case 0x0142: - AaruLogging.Write("{0}", Features.Prettify_0142(desc.Data)); + AaruLogging.Write(Features.Prettify_0142(desc.Data)); PrintHex.PrintHexArray(desc.Data, 64); break; @@ -594,7 +594,7 @@ static class Mmc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_CONFIGURATION_decoded_sense); - if(senseBuffer != null) AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + if(senseBuffer != null) AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -617,8 +617,8 @@ static class Mmc static void PreventAllowMediumRemoval(string devPath, Device dev) { - bool prevent = false; - bool persistent = false; + var prevent = false; + var persistent = false; string strDev; int item; @@ -702,7 +702,7 @@ static class Mmc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -759,12 +759,12 @@ static class Mmc uint address = 0; uint length = 1; MmcSectorTypes sectorType = MmcSectorTypes.AllTypes; - bool dap = false; - bool relative = false; - bool sync = false; + var dap = false; + var relative = false; + var sync = false; MmcHeaderCodes header = MmcHeaderCodes.None; - bool user = true; - bool edc = false; + var user = true; + var edc = false; MmcErrorField c2 = MmcErrorField.None; MmcSubchannel subchan = MmcSubchannel.None; uint blockSize = 2352; @@ -1083,7 +1083,7 @@ static class Mmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1112,11 +1112,11 @@ static class Mmc const byte endSecond = 0; byte endMinute = 0; MmcSectorTypes sectorType = MmcSectorTypes.AllTypes; - bool dap = false; - bool sync = false; + var dap = false; + var sync = false; MmcHeaderCodes header = MmcHeaderCodes.None; - bool user = true; - bool edc = false; + var user = true; + var edc = false; MmcErrorField c2 = MmcErrorField.None; MmcSubchannel subchan = MmcSubchannel.None; uint blockSize = 2352; @@ -1382,8 +1382,8 @@ static class Mmc } start: - uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); - uint endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); + var startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); + var endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); Console.Clear(); bool sense = dev.ReadCdMsf(out byte[] buffer, @@ -1471,7 +1471,7 @@ static class Mmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_MSF_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1617,7 +1617,7 @@ static class Mmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DISC_INFORMATION_decoded_response); - AaruLogging.Write("{0}", DiscInformation.Prettify(buffer)); + AaruLogging.Write(DiscInformation.Prettify(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1641,7 +1641,7 @@ static class Mmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DISC_INFORMATION_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1951,7 +1951,7 @@ static class Mmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DISC_STRUCTURE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1973,7 +1973,7 @@ static class Mmc static void ReadTocPmaAtip(string devPath, Device dev) { - bool msf = false; + var msf = false; byte format = 0; byte session = 0; string strDev; @@ -2126,32 +2126,32 @@ static class Mmc switch(format) { case 0: - AaruLogging.Write("{0}", TOC.Prettify(buffer)); + AaruLogging.Write(TOC.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; case 1: - AaruLogging.Write("{0}", Session.Prettify(buffer)); + AaruLogging.Write(Session.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; case 2: - AaruLogging.Write("{0}", FullTOC.Prettify(buffer)); + AaruLogging.Write(FullTOC.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; case 3: - AaruLogging.Write("{0}", PMA.Prettify(buffer)); + AaruLogging.Write(PMA.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; case 4: - AaruLogging.Write("{0}", ATIP.Prettify(buffer)); + AaruLogging.Write(ATIP.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; case 5: - AaruLogging.Write("{0}", CDTextOnLeadIn.Prettify(buffer)); + AaruLogging.Write(CDTextOnLeadIn.Prettify(buffer)); PrintHex.PrintHexArray(buffer, 64); break; @@ -2182,7 +2182,7 @@ static class Mmc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_TOC_PMA_ATIP_decoded_sense); - if(senseBuffer != null) AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + if(senseBuffer != null) AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -2205,10 +2205,10 @@ static class Mmc static void StartStopUnit(string devPath, Device dev) { - bool immediate = false; - bool changeFormatLayer = false; - bool loadEject = false; - bool start = false; + var immediate = false; + var changeFormatLayer = false; + var loadEject = false; + var start = false; byte formatLayer = 0; byte powerConditions = 0; string strDev; @@ -2350,7 +2350,7 @@ static class Mmc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.START_STOP_UNIT_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/NEC.cs b/Aaru.Tests.Devices/SCSI/NEC.cs index cd32d77d2..7bae67200 100644 --- a/Aaru.Tests.Devices/SCSI/NEC.cs +++ b/Aaru.Tests.Devices/SCSI/NEC.cs @@ -222,7 +222,7 @@ static class Nec Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_DA_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/Pioneer.cs b/Aaru.Tests.Devices/SCSI/Pioneer.cs index 9a260ce5a..e99331713 100644 --- a/Aaru.Tests.Devices/SCSI/Pioneer.cs +++ b/Aaru.Tests.Devices/SCSI/Pioneer.cs @@ -268,7 +268,7 @@ static class Pioneer Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_DA_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -442,8 +442,8 @@ static class Pioneer } start: - uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); - uint endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); + var startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); + var endMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame); Console.Clear(); bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, @@ -524,7 +524,7 @@ static class Pioneer Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_DA_MSF_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -548,8 +548,8 @@ static class Pioneer { uint address = 0; uint length = 1; - bool errorFlags = false; - bool wholeSector = false; + var errorFlags = false; + var wholeSector = false; string strDev; int item; @@ -720,7 +720,7 @@ static class Pioneer Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_XA_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs index b00796e3f..1f9bd9a11 100644 --- a/Aaru.Tests.Devices/SCSI/Plasmon.cs +++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs @@ -83,12 +83,12 @@ static class Plasmon static void ReadLong(string devPath, Device dev) { - bool relative = false; + var relative = false; uint address = 0; ushort length = 1; ushort bps = 512; - bool physical = false; - bool sectorCount = true; + var physical = false; + var sectorCount = true; string strDev; int item; @@ -305,7 +305,7 @@ static class Plasmon Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LONG_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -328,7 +328,7 @@ static class Plasmon static void ReadSectorLocation(string devPath, Device dev) { uint address = 0; - bool physical = false; + var physical = false; string strDev; int item; @@ -478,7 +478,7 @@ static class Plasmon Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_SECTOR_LOCATION_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs index 5ee04178e..8e2de7271 100644 --- a/Aaru.Tests.Devices/SCSI/Plextor.cs +++ b/Aaru.Tests.Devices/SCSI/Plextor.cs @@ -143,7 +143,7 @@ static class Plextor static void GetBookBitsetting(string devPath, Device dev) { - bool dl = false; + var dl = false; string strDev; int item; @@ -272,7 +272,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_BOOK_BITSETTING_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -370,7 +370,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_GIGAREC_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -466,7 +466,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_SECUREC_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -562,7 +562,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_SILENT_MODE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -658,7 +658,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_SINGLE_SESSION_HIDE_CD_R_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -754,7 +754,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_SPEEDREAD_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -850,7 +850,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_TEST_WRITE_DVD_Plus_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -870,7 +870,7 @@ static class Plextor static void GetVariRec(string devPath, Device dev) { - bool dvd = false; + var dvd = false; string strDev; int item; @@ -999,7 +999,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.GET_VARIREC_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1043,7 +1043,7 @@ static class Plextor AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.POWEREC_GET_SPEEDS_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -1275,7 +1275,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CD_DA_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1441,7 +1441,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_DVD_RAW_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1539,7 +1539,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_EEPROM_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1703,7 +1703,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_EEPROM_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1801,7 +1801,7 @@ static class Plextor Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_EEPROM_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/SBC.cs b/Aaru.Tests.Devices/SCSI/SBC.cs index 964b0e4ba..a1698c4fa 100644 --- a/Aaru.Tests.Devices/SCSI/SBC.cs +++ b/Aaru.Tests.Devices/SCSI/SBC.cs @@ -278,7 +278,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -304,11 +304,11 @@ static class Sbc uint blockSize = 512; byte count = 1; byte rdprotect = 0; - bool dpo = false; - bool fua = false; - bool fuaNv = false; + var dpo = false; + var fua = false; + var fuaNv = false; const byte groupNumber = 0; - bool relative = false; + var relative = false; string strDev; int item; @@ -549,7 +549,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -575,12 +575,12 @@ static class Sbc uint blockSize = 512; byte count = 1; byte rdprotect = 0; - bool dpo = false; - bool fua = false; - bool fuaNv = false; + var dpo = false; + var fua = false; + var fuaNv = false; const byte groupNumber = 0; - bool relative = false; - bool streaming = false; + var relative = false; + var streaming = false; string strDev; int item; @@ -835,7 +835,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_12_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -861,11 +861,11 @@ static class Sbc uint blockSize = 512; byte count = 1; byte rdprotect = 0; - bool dpo = false; - bool fua = false; - bool fuaNv = false; + var dpo = false; + var fua = false; + var fuaNv = false; const byte groupNumber = 0; - bool streaming = false; + var streaming = false; string strDev; int item; @@ -1106,7 +1106,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1130,8 +1130,8 @@ static class Sbc { uint lba = 0; ushort blockSize = 512; - bool correct = false; - bool relative = false; + var correct = false; + var relative = false; string strDev; int item; @@ -1302,7 +1302,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LONG_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1326,7 +1326,7 @@ static class Sbc { ulong lba = 0; uint blockSize = 512; - bool correct = false; + var correct = false; string strDev; int item; @@ -1483,7 +1483,7 @@ static class Sbc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_LONG_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1579,7 +1579,7 @@ static class Sbc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.SEEK_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -1699,7 +1699,7 @@ static class Sbc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.SEEK_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/SMC.cs b/Aaru.Tests.Devices/SCSI/SMC.cs index 9156d0b01..bc1a48bf5 100644 --- a/Aaru.Tests.Devices/SCSI/SMC.cs +++ b/Aaru.Tests.Devices/SCSI/SMC.cs @@ -83,7 +83,7 @@ static class Smc byte volume = 0; byte partition = 0; ushort firstAttribute = 0; - bool cache = false; + var cache = false; ScsiAttributeAction action = ScsiAttributeAction.Values; string strDev; int item; @@ -307,7 +307,7 @@ static class Smc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_ATTRIBUTE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI/SPC.cs b/Aaru.Tests.Devices/SCSI/SPC.cs index 8a02d5385..4be6445ab 100644 --- a/Aaru.Tests.Devices/SCSI/SPC.cs +++ b/Aaru.Tests.Devices/SCSI/SPC.cs @@ -188,7 +188,7 @@ static class Spc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.INQUIRY_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.SCSI.Inquiry.Prettify(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.SCSI.Inquiry.Prettify(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -213,7 +213,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.INQUIRY_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -362,7 +362,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.INQUIRY_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -384,7 +384,7 @@ static class Spc static void ModeSense6(string devPath, Device dev) { - bool dbd = false; + var dbd = false; ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current; byte page = 0x3F; byte subpage = 0xFF; @@ -555,7 +555,7 @@ static class Spc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.MODE_SENSE_6_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", Modes.PrettifyModeHeader6(buffer, dev.ScsiType)); + if(buffer != null) AaruLogging.WriteLine(Modes.PrettifyModeHeader6(buffer, dev.ScsiType)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -580,7 +580,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.MODE_SENSE_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -602,8 +602,8 @@ static class Spc static void ModeSense10(string devPath, Device dev) { - bool llba = false; - bool dbd = false; + var llba = false; + var dbd = false; ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current; byte page = 0x3F; byte subpage = 0xFF; @@ -788,7 +788,7 @@ static class Spc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.MODE_SENSE_10_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", Modes.PrettifyModeHeader10(buffer, dev.ScsiType)); + if(buffer != null) AaruLogging.WriteLine(Modes.PrettifyModeHeader10(buffer, dev.ScsiType)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -813,7 +813,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.MODE_SENSE_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -909,7 +909,7 @@ static class Spc AaruLogging.WriteLine(Localization.Command_took_0_ms, duration); AaruLogging.WriteLine(Localization.Sense_is_0, sense); AaruLogging.WriteLine(Localization.PREVENT_ALLOW_MEDIUM_REMOVAL_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Send_command_again); @@ -949,8 +949,8 @@ static class Spc static void ReadCapacity10(string devPath, Device dev) { - bool relative = false; - bool partial = false; + var relative = false; + var partial = false; uint address = 0; string strDev; int item; @@ -1108,7 +1108,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CAPACITY_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1130,7 +1130,7 @@ static class Spc static void ReadCapacity16(string devPath, Device dev) { - bool partial = false; + var partial = false; ulong address = 0; string strDev; int item; @@ -1274,7 +1274,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_CAPACITY_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1372,7 +1372,7 @@ static class Spc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_MEDIA_SERIAL_NUMBER_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1392,7 +1392,7 @@ static class Spc static void RequestSense(string devPath, Device dev) { - bool descriptor = false; + var descriptor = false; string strDev; int item; @@ -1459,7 +1459,7 @@ static class Spc ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer)); AaruLogging.WriteLine(Localization.REQUEST_SENSE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer)); + AaruLogging.Write(Sense.PrettifySense(senseBuffer)); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -1528,7 +1528,7 @@ static class Spc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.TEST_UNIT_READY_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/SSC.cs b/Aaru.Tests.Devices/SCSI/SSC.cs index f0cfc6c75..88218b01e 100644 --- a/Aaru.Tests.Devices/SCSI/SSC.cs +++ b/Aaru.Tests.Devices/SCSI/SSC.cs @@ -144,11 +144,11 @@ static class Ssc static void LoadUnload(string devPath, Device dev) { - bool load = true; - bool immediate = false; - bool retense = false; - bool eot = false; - bool hold = false; + var load = true; + var immediate = false; + var retense = false; + var eot = false; + var hold = false; string strDev; int item; @@ -274,7 +274,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.LOAD_UNLOAD_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -328,9 +328,9 @@ static class Ssc static void Locate10(string devPath, Device dev) { - bool blockType = true; - bool immediate = false; - bool changePartition = false; + var blockType = true; + var immediate = false; + var changePartition = false; byte partition = 0; uint objectId = 0; string strDev; @@ -458,7 +458,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.LOCATE_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -513,9 +513,9 @@ static class Ssc static void Locate16(string devPath, Device dev) { SscLogicalIdTypes destType = SscLogicalIdTypes.FileId; - bool immediate = false; - bool changePartition = false; - bool bam = false; + var immediate = false; + var changePartition = false; + var bam = false; byte partition = 0; ulong objectId = 1; string strDev; @@ -665,7 +665,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.LOCATE_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -719,8 +719,8 @@ static class Ssc static void Read6(string devPath, Device dev) { - bool sili = false; - bool fixedLen = true; + var sili = false; + var fixedLen = true; uint blockSize = 512; uint length = 1; string strDev; @@ -911,7 +911,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -933,8 +933,8 @@ static class Ssc static void Read16(string devPath, Device dev) { - bool sili = false; - bool fixedLen = true; + var sili = false; + var fixedLen = true; uint objectSize = 512; uint length = 1; byte partition = 0; @@ -1154,7 +1154,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1241,7 +1241,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_BLOCK_LIMITS_decoded_response); - if(buffer != null) AaruLogging.WriteLine("{0}", BlockLimits.Prettify(buffer)); + if(buffer != null) AaruLogging.WriteLine(BlockLimits.Prettify(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -1266,7 +1266,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_BLOCK_LIMITS_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1370,7 +1370,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.READ_POSITION_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -1424,9 +1424,9 @@ static class Ssc static void ReadReverse6(string devPath, Device dev) { - bool byteOrder = false; - bool sili = false; - bool fixedLen = true; + var byteOrder = false; + var sili = false; + var fixedLen = true; uint blockSize = 512; uint length = 1; string strDev; @@ -1631,7 +1631,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_REVERSE_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1653,9 +1653,9 @@ static class Ssc static void ReadReverse16(string devPath, Device dev) { - bool byteOrder = false; - bool sili = false; - bool fixedLen = true; + var byteOrder = false; + var sili = false; + var fixedLen = true; uint objectSize = 512; uint length = 1; byte partition = 0; @@ -1889,7 +1889,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_REVERSE_16_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -1911,8 +1911,8 @@ static class Ssc static void RecoverBufferedData(string devPath, Device dev) { - bool sili = false; - bool fixedLen = true; + var sili = false; + var fixedLen = true; uint blockSize = 512; uint length = 1; string strDev; @@ -2103,7 +2103,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.RECOVER_BUFFERED_DATA_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -2125,8 +2125,8 @@ static class Ssc static void ReportDensitySupport(string devPath, Device dev) { - bool medium = false; - bool current = false; + var medium = false; + var current = false; string strDev; int item; @@ -2286,7 +2286,7 @@ static class Ssc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.REPORT_DENSITY_SUPPORT_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -2308,7 +2308,7 @@ static class Ssc static void Rewind(string devPath, Device dev) { - bool immediate = false; + var immediate = false; string strDev; int item; @@ -2374,7 +2374,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.REWIND_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -2518,7 +2518,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.SPACE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); @@ -2638,7 +2638,7 @@ static class Ssc AaruLogging.WriteLine(Localization.Sense_buffer_is_null_or_empty_0, senseBuffer.IsEmpty); AaruLogging.WriteLine(Localization.TRACK_SELECT_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(); AaruLogging.WriteLine(Localization.Choose_what_to_do); AaruLogging.WriteLine(Localization._1_Print_sense_buffer); diff --git a/Aaru.Tests.Devices/SCSI/SyQuest.cs b/Aaru.Tests.Devices/SCSI/SyQuest.cs index 97a7a5a29..4d53b7c5e 100644 --- a/Aaru.Tests.Devices/SCSI/SyQuest.cs +++ b/Aaru.Tests.Devices/SCSI/SyQuest.cs @@ -101,7 +101,7 @@ static class SyQuest uint lba = 0; uint blockSize = 512; byte count = 1; - bool noDma = false; + var noDma = false; string strDev; int item; @@ -292,7 +292,7 @@ static class SyQuest ? Localization.READ_LONG_6_decoded_sense : Localization.READ_6_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -317,7 +317,7 @@ static class SyQuest uint lba = 0; uint blockSize = 512; byte count = 1; - bool noDma = false; + var noDma = false; string strDev; int item; @@ -501,7 +501,7 @@ static class SyQuest ? Localization.READ_LONG_10_decoded_sense : Localization.READ_10_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); @@ -599,7 +599,7 @@ static class SyQuest Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.READ_RESET_USAGE_COUNTER_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs index b959a6158..5846ce789 100644 --- a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs +++ b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs @@ -54,7 +54,7 @@ static partial class ScsiMmc if(sense) { AaruLogging.WriteLine(Localization.READ_FULL_TOC_failed); - AaruLogging.WriteLine("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.WriteLine(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadLine(); @@ -159,7 +159,7 @@ static partial class ScsiMmc if(sense) { AaruLogging.WriteLine(Localization.READ_FULL_TOC_failed); - AaruLogging.WriteLine("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.WriteLine(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadLine(); @@ -527,7 +527,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_zero_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba0Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba0Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -558,7 +558,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_zero_scrambled_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba0ScrambledSense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba0ScrambledSense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -589,7 +589,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_44990_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba44990Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba44990Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -620,7 +620,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_45000_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba45000Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba45000Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -651,7 +651,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_50000_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba50000Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba50000Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -682,7 +682,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_100000_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba100000Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba100000Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -713,7 +713,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_400000_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba400000Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba400000Sense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -744,7 +744,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_450000_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(lba450000Sense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(lba450000Sense.ToArray())); AaruLogging.WriteLine(Localization.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 2766537a0..e517fa2f4 100644 --- a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs +++ b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs @@ -54,7 +54,7 @@ static partial class ScsiMmc if(sense) { AaruLogging.WriteLine(Localization.READ_FULL_TOC_failed); - AaruLogging.WriteLine("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.WriteLine(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadLine(); @@ -127,7 +127,7 @@ static partial class ScsiMmc if(sense) { AaruLogging.WriteLine(Localization.READ_FULL_TOC_failed); - AaruLogging.WriteLine("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.WriteLine(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadLine(); @@ -231,7 +231,7 @@ static partial class ScsiMmc if(sense) { AaruLogging.WriteLine(Localization.READ_FULL_TOC_failed); - AaruLogging.WriteLine("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.WriteLine(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadLine(); @@ -508,7 +508,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_0_decoded_sense, sectors + 5); - AaruLogging.Write("{0}", Sense.PrettifySense(dataSense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(dataSense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -539,7 +539,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_0_scrambled_decoded_sense, sectors + 5); - AaruLogging.Write("{0}", Sense.PrettifySense(scrambledSense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(scrambledSense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -570,7 +570,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_PQ_decoded_sense, sectors + 5); - AaruLogging.Write("{0}", Sense.PrettifySense(pqSense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(pqSense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -601,7 +601,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.LBA_RW_0_decoded_sense, sectors + 5); - AaruLogging.Write("{0}", Sense.PrettifySense(rwSense.ToArray())); + AaruLogging.Write(Sense.PrettifySense(rwSense.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); diff --git a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs index cbddcc676..7541e43fe 100644 --- a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs +++ b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs @@ -157,7 +157,7 @@ static partial class ScsiMmc Console.Clear(); AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.MediaTek_READ_CACHE_decoded_sense); - AaruLogging.Write("{0}", Sense.PrettifySense(senseBuffer.ToArray())); + AaruLogging.Write(Sense.PrettifySense(senseBuffer.ToArray())); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); Console.Clear(); diff --git a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs index f2ae39fb9..0b745b1f0 100644 --- a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs +++ b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs @@ -115,7 +115,7 @@ static class MultiMediaCard uint address = 0; uint blockSize = 512; ushort count = 1; - bool byteAddr = false; + var byteAddr = false; string strDev; int item; @@ -371,7 +371,7 @@ static class MultiMediaCard AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_OP_COND_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyOCR(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -547,7 +547,7 @@ static class MultiMediaCard AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_CID_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyCID(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -642,7 +642,7 @@ static class MultiMediaCard AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_CSD_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyCSD(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -737,7 +737,7 @@ static class MultiMediaCard AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_EXT_CSD_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); diff --git a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs index fc6b220f7..932a9e8ee 100644 --- a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs +++ b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs @@ -115,7 +115,7 @@ static class SecureDigital uint address = 0; uint blockSize = 512; ushort count = 1; - bool byteAddr = false; + var byteAddr = false; string strDev; int item; @@ -371,7 +371,7 @@ static class SecureDigital AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SD_SEND_OP_COND_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyOCR(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -547,7 +547,7 @@ static class SecureDigital AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_CID_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyCID(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -642,7 +642,7 @@ static class SecureDigital AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_CSD_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyCSD(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); @@ -737,7 +737,7 @@ static class SecureDigital AaruLogging.WriteLine(Localization.Device_0, devPath); AaruLogging.WriteLine(Localization.SEND_SCR_decoded_buffer); - if(buffer != null) AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(buffer)); + if(buffer != null) AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifySCR(buffer)); AaruLogging.WriteLine(Localization.Press_any_key_to_continue); Console.ReadKey(); diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs index dead0eab6..2d8c55e03 100644 --- a/Aaru/Commands/Device/Info.cs +++ b/Aaru/Commands/Device/Info.cs @@ -208,15 +208,15 @@ sealed class DeviceInfoCommand : Command break; case TupleCodes.CISTPL_DEVICEGEO: case TupleCodes.CISTPL_DEVICEGEO_A: - AaruLogging.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyDeviceGeometryTuple(tuple)); break; case TupleCodes.CISTPL_MANFID: - AaruLogging.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyManufacturerIdentificationTuple(tuple)); break; case TupleCodes.CISTPL_VERS_1: - AaruLogging.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple)); + AaruLogging.WriteLine(CIS.PrettifyLevel1VersionTuple(tuple)); break; case TupleCodes.CISTPL_ALTSTR: @@ -417,7 +417,7 @@ sealed class DeviceInfoCommand : Command break; case 0x81: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_81(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_81(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -438,7 +438,7 @@ sealed class DeviceInfoCommand : Command break; case 0x83: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_83(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_83(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -448,7 +448,7 @@ sealed class DeviceInfoCommand : Command break; case 0x84: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_84(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_84(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -458,7 +458,7 @@ sealed class DeviceInfoCommand : Command break; case 0x85: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_85(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_85(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -468,7 +468,7 @@ sealed class DeviceInfoCommand : Command break; case 0x86: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_86(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_86(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -478,7 +478,7 @@ sealed class DeviceInfoCommand : Command break; case 0x89: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_89(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_89(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -488,7 +488,7 @@ sealed class DeviceInfoCommand : Command break; case 0xB0: - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_B0(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_B0(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -545,7 +545,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "quantum": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C0_Quantum(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C0_Quantum(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -558,7 +558,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "seagate": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C0_Seagate(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C0_Seagate(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -571,7 +571,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "ibm": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C0_IBM(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C0_IBM(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -584,7 +584,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "ibm": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C1_IBM(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C1_IBM(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -598,7 +598,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "certance": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C0_C1_Certance(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C0_C1_Certance(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -612,7 +612,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "certance": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -626,7 +626,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "hp": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_C0_to_C5_HP(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_C0_to_C5_HP(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -639,7 +639,7 @@ sealed class DeviceInfoCommand : Command .ToLowerInvariant() .Trim() == "certance": - AaruLogging.WriteLine("{0}", EVPD.PrettifyPage_DF_Certance(page.Value)); + AaruLogging.WriteLine(EVPD.PrettifyPage_DF_Certance(page.Value)); DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, @@ -1198,21 +1198,21 @@ sealed class DeviceInfoCommand : Command { noInfo = false; DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, "_mmc_cid.bin", "MMC CID", devInfo.CID); - AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(devInfo.CID)); + AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyCID(devInfo.CID)); } if(devInfo.CSD != null) { noInfo = false; DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, "_mmc_csd.bin", "MMC CSD", devInfo.CSD); - AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD)); + AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD)); } if(devInfo.OCR != null) { noInfo = false; DataFile.WriteTo(MODULE_NAME, settings.OutputPrefix, "_mmc_ocr.bin", "MMC OCR", devInfo.OCR); - AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR)); + AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR)); } if(devInfo.ExtendedCSD != null) @@ -1225,7 +1225,7 @@ sealed class DeviceInfoCommand : Command "MMC Extended CSD", devInfo.ExtendedCSD); - AaruLogging.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD)); + AaruLogging.WriteLine(Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD)); } if(noInfo) AaruLogging.Error(UI.Could_not_get_any_kind_of_information_from_the_device); @@ -1246,7 +1246,7 @@ sealed class DeviceInfoCommand : Command "SecureDigital CID", devInfo.CID); - AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID)); + AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID)); } if(devInfo.CSD != null) @@ -1259,7 +1259,7 @@ sealed class DeviceInfoCommand : Command "SecureDigital CSD", devInfo.CSD); - AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD)); + AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD)); } if(devInfo.OCR != null) @@ -1272,7 +1272,7 @@ sealed class DeviceInfoCommand : Command "SecureDigital OCR", devInfo.OCR); - AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR)); + AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR)); } if(devInfo.SCR != null) @@ -1285,7 +1285,7 @@ sealed class DeviceInfoCommand : Command "SecureDigital SCR", devInfo.SCR); - AaruLogging.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR)); + AaruLogging.WriteLine(Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR)); } if(noInfo) AaruLogging.Error(UI.Could_not_get_any_kind_of_information_from_the_device); diff --git a/Aaru/Commands/Filesystem/Info.cs b/Aaru/Commands/Filesystem/Info.cs index d99991877..43a186483 100644 --- a/Aaru/Commands/Filesystem/Info.cs +++ b/Aaru/Commands/Filesystem/Info.cs @@ -307,7 +307,7 @@ sealed class FilesystemInfoCommand : Command out information, out FileSystem fsMetadata); - AaruLogging.Write("{0}", information); + AaruLogging.Write(information); Statistics.AddFilesystem(fsMetadata.Type); break;