aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Use string interpolation expression.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 17:58:51 +00:00
parent a895700757
commit 4e6e8f340a
182 changed files with 766 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DiscImageChef.Core/Devices/ReaderSCSI.cs
View File

@@ -88,16 +88,14 @@ namespace DiscImageChef.Core.Devices
if(read6 && !read10 && !read12 && !read16 && Blocks > 0x001FFFFF + 1)
{
ErrorMessage =
string.Format("Device only supports SCSI READ (6) but has more than {0} blocks ({1} blocks total)",
0x001FFFFF + 1, Blocks);
$"Device only supports SCSI READ (6) but has more than {0x001FFFFF + 1} blocks ({Blocks} blocks total)";
return true;
}
if(!read16 && Blocks > 0xFFFFFFFF + (long)1)
{
ErrorMessage =
string.Format("Device only supports SCSI READ (10) but has more than {0} blocks ({1} blocks total)",
0xFFFFFFFF + (long)1, Blocks);
$"Device only supports SCSI READ (10) but has more than {0xFFFFFFFF + (long)1} blocks ({Blocks} blocks total)";
return true;
}
@@ -403,8 +401,7 @@ namespace DiscImageChef.Core.Devices
if(sense && Blocks == 0)
if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
{
ErrorMessage = string.Format("Unable to get media capacity\n" + "{0}",
Sense.PrettifySense(senseBuf));
ErrorMessage = "Unable to get media capacity\n" + $"{Sense.PrettifySense(senseBuf)}";
return true;
}
@@ -465,7 +462,7 @@ namespace DiscImageChef.Core.Devices
if(!dev.Error) return false;
BlocksToRead = 1;
ErrorMessage = string.Format("Device error {0} trying to guess ideal transfer length.", dev.LastError);
ErrorMessage = $"Device error {dev.LastError} trying to guess ideal transfer length.";
return true;
}