From c47b866af19e9c724cad9de44d95e1fe8d611d78 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 21 Dec 2017 17:58:51 +0000 Subject: [PATCH] REFACTOR: Use string interpolation expression. --- DVD/PFI.cs | 2 +- MMC/CSD.cs | 2 +- MMC/VendorString.cs | 2 +- PCMCIA/VendorCode.cs | 2 +- SCSI/EVPD.cs | 4 +- SCSI/Modes/11.cs | 2 +- SCSI/Modes/Headers.cs | 151 ++++++++++++---------------------- SCSI/Sense.cs | 21 +++-- SecureDigital/CSD.cs | 2 +- SecureDigital/VendorString.cs | 2 +- Xbox/SS.cs | 2 +- 11 files changed, 72 insertions(+), 120 deletions(-) diff --git a/DVD/PFI.cs b/DVD/PFI.cs index 9db739e..00542f9 100644 --- a/DVD/PFI.cs +++ b/DVD/PFI.cs @@ -1337,7 +1337,7 @@ namespace DiscImageChef.Decoders.DVD sizeString = "120mm"; break; default: - sizeString = string.Format("unknown size identifier {0}", decoded.DiscSize); + sizeString = $"unknown size identifier {decoded.DiscSize}"; break; } diff --git a/MMC/CSD.cs b/MMC/CSD.cs index 74cf3a8..7cc70bd 100644 --- a/MMC/CSD.cs +++ b/MMC/CSD.cs @@ -337,7 +337,7 @@ namespace DiscImageChef.Decoders.MMC sb.AppendFormat("\tDevice's clock frequency: {0}{1}", result, unit).AppendLine(); unit = ""; - for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1) if((csd.Classes & mask) == mask) unit += string.Format(" {0}", cl); + for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1) if((csd.Classes & mask) == mask) unit += $" {cl}"; sb.AppendFormat("\tDevice support command classes {0}", unit).AppendLine(); if(csd.ReadBlockLength == 15) sb.AppendLine("\tRead block length size is defined in extended CSD"); diff --git a/MMC/VendorString.cs b/MMC/VendorString.cs index feaa416..4bf5e23 100644 --- a/MMC/VendorString.cs +++ b/MMC/VendorString.cs @@ -39,7 +39,7 @@ namespace DiscImageChef.Decoders.MMC switch(MMCVendorID) { case 0x15: return "Samsung"; - default: return string.Format("Unknown manufacturer ID 0x{0:X2}", MMCVendorID); + default: return $"Unknown manufacturer ID 0x{MMCVendorID:X2}"; } } } diff --git a/PCMCIA/VendorCode.cs b/PCMCIA/VendorCode.cs index c5a89a7..9a4fd69 100644 --- a/PCMCIA/VendorCode.cs +++ b/PCMCIA/VendorCode.cs @@ -353,7 +353,7 @@ namespace DiscImageChef.Decoders.PCMCIA case 0xC020: return "NextCom K.K."; case 0xC250: return "EMTAC Technology Corporation"; case 0xD601: return "Elsa"; - default: return string.Format("Unknown vendor id 0x{0:X4}", id); + default: return $"Unknown vendor id 0x{id:X4}"; } } } diff --git a/SCSI/EVPD.cs b/SCSI/EVPD.cs index 7035f8e..d14ac39 100644 --- a/SCSI/EVPD.cs +++ b/SCSI/EVPD.cs @@ -185,7 +185,7 @@ namespace DiscImageChef.Decoders.SCSI case ScsiDefinitions.SCSI1: return "SCSI-1"; case ScsiDefinitions.SCSI2: return "SCSI-2"; case ScsiDefinitions.SCSI3: return "SCSI-3"; - default: return string.Format("Unknown definition code {0}", (byte)definition); + default: return $"Unknown definition code {(byte)definition}"; } } @@ -510,7 +510,7 @@ namespace DiscImageChef.Decoders.SCSI protocol = "USB Attached SCSI"; break; default: - protocol = string.Format("unknown code {0}", (byte)descriptor.ProtocolIdentifier); + protocol = $"unknown code {(byte)descriptor.ProtocolIdentifier}"; break; } diff --git a/SCSI/Modes/11.cs b/SCSI/Modes/11.cs index 089c0cb..42638bc 100644 --- a/SCSI/Modes/11.cs +++ b/SCSI/Modes/11.cs @@ -214,7 +214,7 @@ namespace DiscImageChef.Decoders.SCSI case PartitionSizeUnitOfMeasures.Exponential: sb.AppendFormat("\tPartitions are defined in units of {0} bytes", Math.Pow(10, page.PartitionUnits)) .AppendLine(); - measure = string.Format("units of {0} bytes", Math.Pow(10, page.PartitionUnits)); + measure = $"units of {Math.Pow(10, page.PartitionUnits)} bytes"; break; default: sb.AppendFormat("\tUnknown partition size unit code {0}", (byte)page.PSUM).AppendLine(); diff --git a/SCSI/Modes/Headers.cs b/SCSI/Modes/Headers.cs index f81bc48..5f66c9f 100644 --- a/SCSI/Modes/Headers.cs +++ b/SCSI/Modes/Headers.cs @@ -89,7 +89,7 @@ namespace DiscImageChef.Decoders.SCSI return "a combination of write-once and erasable optical"; */ case MediumTypes.DOW: return "a direct-overwrite optical"; - default: return string.Format("Unknown medium type 0x{0:X2}", (byte)type); + default: return $"Unknown medium type 0x{(byte)type:X2}"; } } @@ -131,8 +131,7 @@ namespace DiscImageChef.Decoders.SCSI density = "15916 flux transitions per radian"; break; default: - density = string.Format("with unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"with unknown density code 0x{(byte)descriptor.Density:X2}"; break; } @@ -360,7 +359,7 @@ namespace DiscImageChef.Decoders.SCSI medium = "Exatape 75m"; break; default: - medium = string.Format("unknown medium type 0x{0:X2}", (byte)header.Value.MediumType); + medium = $"unknown medium type 0x{(byte)header.Value.MediumType:X2}"; break; } @@ -519,8 +518,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DDS-4"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -543,8 +541,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-5 WORM"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -558,8 +555,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -573,8 +569,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-2"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -591,8 +586,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DDS-3"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -609,8 +603,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DDS-4"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -624,8 +617,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DAT-72"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -640,8 +632,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-3"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -655,8 +646,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DDS cleaning cartridge"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -671,8 +661,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-4"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -687,8 +676,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-5"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -703,8 +691,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-6"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -719,8 +706,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-7"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -743,8 +729,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-5 in CD emulation mode"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -779,8 +764,7 @@ namespace DiscImageChef.Decoders.SCSI density = "VXA-1"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -824,8 +808,7 @@ namespace DiscImageChef.Decoders.SCSI density = "VXA-3"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -864,8 +847,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DLTtape III compressed"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -898,8 +880,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DLTtape IIIxt compressed"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -954,8 +935,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DLTtape IV at 98250 bpi compressed"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -995,8 +975,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Super DLTtape I at 133000 bpi compressed"; break;*/ default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1010,8 +989,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Super DLTtape II"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1029,8 +1007,7 @@ namespace DiscImageChef.Decoders.SCSI density = "VStape I compressed"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1044,8 +1021,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DLTtape S4"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1068,8 +1044,7 @@ namespace DiscImageChef.Decoders.SCSI density = "EXB-8500 compressed"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1095,8 +1070,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Mammoth"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1122,8 +1096,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Mammoth"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1149,8 +1122,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Mammoth"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1173,8 +1145,7 @@ namespace DiscImageChef.Decoders.SCSI density = "Mammoth-2"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1188,8 +1159,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DC-2900SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1203,8 +1173,7 @@ namespace DiscImageChef.Decoders.SCSI density = "DC-9250"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1218,8 +1187,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLR-32"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1233,8 +1201,7 @@ namespace DiscImageChef.Decoders.SCSI density = "MRL1-26GBSL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1248,8 +1215,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-50"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1263,8 +1229,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-50 SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1278,8 +1243,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLR-32 SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1293,8 +1257,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLR-5"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1308,8 +1271,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLR-5 SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1323,8 +1285,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-7"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1338,8 +1299,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-7 SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1353,8 +1313,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-24"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1368,8 +1327,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-24 SL"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1383,8 +1341,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-140"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1398,8 +1355,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-40"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1413,8 +1369,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-60 or SLRtape-75"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1428,8 +1383,7 @@ namespace DiscImageChef.Decoders.SCSI density = "SLRtape-100"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } @@ -1443,15 +1397,14 @@ namespace DiscImageChef.Decoders.SCSI density = "SLR40, SLR60 or SLR100"; break; default: - density = string.Format("unknown density code 0x{0:X2}", - (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } } break; default: - density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } @@ -1594,7 +1547,7 @@ namespace DiscImageChef.Decoders.SCSI density = "ANSI X3.200: 356 mm double-sided optical disc with 56350 tracks"; break; default: - density = string.Format("unknown density code 0x{0:X2}", (byte)descriptor.Density); + density = $"unknown density code 0x{(byte)descriptor.Density:X2}"; break; } @@ -1790,7 +1743,7 @@ namespace DiscImageChef.Decoders.SCSI density = "LTO Ultrium-5"; break; default: - density = string.Format("with unknown density code 0x{0:X2}", descriptor.Density); + density = $"with unknown density code 0x{descriptor.Density:X2}"; break; } diff --git a/SCSI/Sense.cs b/SCSI/Sense.cs index fbe5053..ac0c90b 100644 --- a/SCSI/Sense.cs +++ b/SCSI/Sense.cs @@ -371,9 +371,8 @@ namespace DiscImageChef.Decoders.SCSI if(!sense.HasValue) return null; return sense.Value.AddressValid - ? string.Format("Error class {0} type {1} happened on block {2}\n", sense.Value.ErrorClass, - sense.Value.ErrorType, sense.Value.LBA) - : string.Format("Error class {0} type {1}\n", sense.Value.ErrorClass, sense.Value.ErrorType); + ? $"Error class {sense.Value.ErrorClass} type {sense.Value.ErrorType} happened on block {sense.Value.LBA}\n" + : $"Error class {sense.Value.ErrorClass} type {sense.Value.ErrorType}\n"; } public static string PrettifySense(FixedSense? sense) @@ -596,7 +595,7 @@ namespace DiscImageChef.Decoders.SCSI public static string PrettifyDescriptor00(ulong information) { - return string.Format("On logical block {0}\n", information); + return $"On logical block {information}\n"; } public static string PrettifyDescriptor00(byte[] descriptor) @@ -1444,7 +1443,7 @@ namespace DiscImageChef.Decoders.SCSI switch(ASCQ) { case 0x00: return "RAM FAILURE"; - default: return string.Format("DIAGNOSTIC FAILURE ON COMPONENT {0:X2}h", ASCQ); + default: return $"DIAGNOSTIC FAILURE ON COMPONENT {ASCQ:X2}h"; } case 0x41: switch(ASCQ) @@ -1560,7 +1559,7 @@ namespace DiscImageChef.Decoders.SCSI } break; - case 0x4E: return string.Format("OVERLAPPED COMMANDS ATTEMPTED FOR TASK TAG {0:X2}h", ASCQ); + case 0x4E: return $"OVERLAPPED COMMANDS ATTEMPTED FOR TASK TAG {ASCQ:X2}h"; case 0x50: switch(ASCQ) { @@ -1929,7 +1928,7 @@ namespace DiscImageChef.Decoders.SCSI } break; - case 0x70: return string.Format("DECOMPRESSION EXCEPTION SHORT ALGORITHM ID OF {0:X2}h", ASCQ); + case 0x70: return $"DECOMPRESSION EXCEPTION SHORT ALGORITHM ID OF {ASCQ:X2}h"; case 0x71: switch(ASCQ) { @@ -2005,11 +2004,11 @@ namespace DiscImageChef.Decoders.SCSI return ASC >= 0x80 ? ASCQ >= 0x80 - ? string.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) - : string.Format("VENDOR-SPECIFIC ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ) + ? $"VENDOR-SPECIFIC ASC {ASC:X2}h WITH VENDOR-SPECIFIC ASCQ {ASCQ:X2}h" + : $"VENDOR-SPECIFIC ASC {ASC:X2}h WITH ASCQ {ASCQ:X2}h" : ASCQ >= 0x80 - ? string.Format("ASC {0:X2}h WITH VENDOR-SPECIFIC ASCQ {1:X2}h", ASC, ASCQ) - : string.Format("ASC {0:X2}h WITH ASCQ {1:X2}h", ASC, ASCQ); + ? $"ASC {ASC:X2}h WITH VENDOR-SPECIFIC ASCQ {ASCQ:X2}h" + : $"ASC {ASC:X2}h WITH ASCQ {ASCQ:X2}h"; } } } \ No newline at end of file diff --git a/SecureDigital/CSD.cs b/SecureDigital/CSD.cs index ba404a5..076643b 100644 --- a/SecureDigital/CSD.cs +++ b/SecureDigital/CSD.cs @@ -327,7 +327,7 @@ namespace DiscImageChef.Decoders.SecureDigital sb.AppendFormat("\tDevice's transfer speed: {0}{1}", result, unit).AppendLine(); unit = ""; - for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1) if((csd.Classes & mask) == mask) unit += string.Format(" {0}", cl); + for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1) if((csd.Classes & mask) == mask) unit += $" {cl}"; sb.AppendFormat("\tDevice support command classes {0}", unit).AppendLine(); sb.AppendFormat("\tRead block length is {0} bytes", Math.Pow(2, csd.ReadBlockLength)).AppendLine(); diff --git a/SecureDigital/VendorString.cs b/SecureDigital/VendorString.cs index d1c527f..3938a5e 100644 --- a/SecureDigital/VendorString.cs +++ b/SecureDigital/VendorString.cs @@ -39,7 +39,7 @@ namespace DiscImageChef.Decoders.SecureDigital switch(SDVendorID) { case 0xAA: return "QEMU"; - default: return string.Format("Unknown manufacturer ID 0x{0:X2}", SDVendorID); + default: return $"Unknown manufacturer ID 0x{SDVendorID:X2}"; } } } diff --git a/Xbox/SS.cs b/Xbox/SS.cs index b05dcaf..6239339 100644 --- a/Xbox/SS.cs +++ b/Xbox/SS.cs @@ -319,7 +319,7 @@ namespace DiscImageChef.Decoders.Xbox sizeString = "120mm"; break; default: - sizeString = string.Format("unknown size identifier {0}", decoded.DiscSize); + sizeString = $"unknown size identifier {decoded.DiscSize}"; break; }