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

REFACTOR: Remove redundant parentheses.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 17:26:28 +00:00
parent a4650c61aa
commit b0936d51c5
160 changed files with 1096 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
DiscImageChef.Server/App_Start/Ata.cs
View File

@@ -548,19 +548,19 @@ namespace DiscImageChef.Server.App_Start
{
case 1:
ataOneValue.Add(string.Format("{0} KiB of single ported single sector buffer",
(ataReport.BufferSize * logicalsectorsize) / 1024));
ataReport.BufferSize * logicalsectorsize / 1024));
break;
case 2:
ataOneValue.Add(string.Format("{0} KiB of dual ported multi sector buffer",
(ataReport.BufferSize * logicalsectorsize) / 1024));
ataReport.BufferSize * logicalsectorsize / 1024));
break;
case 3:
ataOneValue.Add(string.Format("{0} KiB of dual ported multi sector buffer with read caching",
(ataReport.BufferSize * logicalsectorsize) / 1024));
ataReport.BufferSize * logicalsectorsize / 1024));
break;
default:
ataOneValue.Add(string.Format("{0} KiB of unknown type {1} buffer",
(ataReport.BufferSize * logicalsectorsize) / 1024,
ataReport.BufferSize * logicalsectorsize / 1024,
ataReport.BufferType));
break;
}
@@ -842,8 +842,8 @@ namespace DiscImageChef.Server.App_Start
ataReport.ServiceBusyClear));
}
if(ataReport.TransportMajorVersionSpecified && (((ataReport.TransportMajorVersion & 0xF000) >> 12) == 0x1 ||
((ataReport.TransportMajorVersion & 0xF000) >> 12) == 0xE))
if(ataReport.TransportMajorVersionSpecified && ((ataReport.TransportMajorVersion & 0xF000) >> 12 == 0x1 ||
(ataReport.TransportMajorVersion & 0xF000) >> 12 == 0xE))
{
if(!ataReport.SATACapabilities.HasFlag(SATACapabilitiesBit.Clear))
{
@@ -974,7 +974,7 @@ namespace DiscImageChef.Server.App_Start
ataOneValue.Add("CompactFlash power mode 1 is disabled");
ataOneValue.Add(string.Format("CompactFlash device uses a maximum of {0} mA",
(ataReport.CFAPowerMode & 0x0FFF)));
ataReport.CFAPowerMode & 0x0FFF));
}
}
@@ -1429,8 +1429,8 @@ namespace DiscImageChef.Server.App_Start
ataOneValue.Add("Trusted Computing feature set is supported");
}
if(ataReport.TransportMajorVersionSpecified && (((ataReport.TransportMajorVersion & 0xF000) >> 12) == 0x1 ||
((ataReport.TransportMajorVersion & 0xF000) >> 12) == 0xE))
if(ataReport.TransportMajorVersionSpecified && ((ataReport.TransportMajorVersion & 0xF000) >> 12 == 0x1 ||
(ataReport.TransportMajorVersion & 0xF000) >> 12 == 0xE))
{
if(ataReport.SATACapabilitiesSpecified)
{
@@ -1655,7 +1655,7 @@ namespace DiscImageChef.Server.App_Start
if(ataReport.ReadCapabilities.BlockSizeSpecified &&
ataReport.ReadCapabilities.PhysicalBlockSizeSpecified &&
(ataReport.ReadCapabilities.BlockSize != ataReport.ReadCapabilities.PhysicalBlockSize) &&
ataReport.ReadCapabilities.BlockSize != ataReport.ReadCapabilities.PhysicalBlockSize &&
(ataReport.ReadCapabilities.LogicalAlignment & 0x8000) == 0x0000 &&
(ataReport.ReadCapabilities.LogicalAlignment & 0x4000) == 0x4000)
{
@@ -1685,7 +1685,7 @@ namespace DiscImageChef.Server.App_Start
ataTwoValue.Add("Device size in CHS mode",
string.Format("{0} bytes, {1} Mb, {2:F2} MiB",
(ulong)currentSectors * logicalsectorsize,
((ulong)currentSectors * logicalsectorsize) / 1000 / 1000,
(ulong)currentSectors * logicalsectorsize / 1000 / 1000,
(double)((ulong)currentSectors * logicalsectorsize) / 1024 /
1024));
}
@@ -1702,7 +1702,7 @@ namespace DiscImageChef.Server.App_Start
ataTwoValue.Add("Device size in CHS mode",
string.Format("{0} bytes, {1} Mb, {2:F2} MiB",
(ulong)currentSectors * logicalsectorsize,
((ulong)currentSectors * logicalsectorsize) / 1000 / 1000,
(ulong)currentSectors * logicalsectorsize / 1000 / 1000,
(double)((ulong)currentSectors * logicalsectorsize) / 1024 /
1024));
}
@@ -1712,26 +1712,26 @@ namespace DiscImageChef.Server.App_Start
ataTwoValue.Add("Sectors addressable in sectors in 28-bit LBA mode",
string.Format("{0}", ataReport.ReadCapabilities.LBASectors));
if((((ulong)ataReport.ReadCapabilities.LBASectors * logicalsectorsize) / 1024 / 1024) > 1000000)
if((ulong)ataReport.ReadCapabilities.LBASectors * logicalsectorsize / 1024 / 1024 > 1000000)
{
ataTwoValue.Add("Device size in 28-bit LBA mode",
string.Format("{0} bytes, {1} Tb, {2:F2} TiB",
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize,
((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1000 / 1000 / 1000 / 1000,
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize / 1000 / 1000 / 1000 / 1000,
(double)((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1024 / 1024 / 1024 / 1024));
}
else if((((ulong)ataReport.ReadCapabilities.LBASectors * logicalsectorsize) / 1024 / 1024) >
else if((ulong)ataReport.ReadCapabilities.LBASectors * logicalsectorsize / 1024 / 1024 >
1000)
{
ataTwoValue.Add("Device size in 28-bit LBA mode",
string.Format("{0} bytes, {1} Gb, {2:F2} GiB",
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize,
((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1000 / 1000 / 1000,
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize / 1000 / 1000 / 1000,
(double)((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1024 / 1024 / 1024));
}
@@ -1741,8 +1741,8 @@ namespace DiscImageChef.Server.App_Start
string.Format("{0} bytes, {1} Mb, {2:F2} MiB",
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize,
((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1000 / 1000,
(ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize / 1000 / 1000,
(double)((ulong)ataReport.ReadCapabilities.LBASectors *
logicalsectorsize) / 1024 / 1024));
}
@@ -1753,23 +1753,23 @@ namespace DiscImageChef.Server.App_Start
ataTwoValue.Add("Sectors addressable in sectors in 48-bit LBA mode",
string.Format("{0}", ataReport.ReadCapabilities.LBA48Sectors));
if(((ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize) / 1024 / 1024) > 1000000)
if(ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize / 1024 / 1024 > 1000000)
{
ataTwoValue.Add("Device size in 48-bit LBA mode",
string.Format("{0} bytes, {1} Tb, {2:F2} TiB",
ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize,
(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1000 / 1000 / 1000 / 1000,
ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize / 1000 / 1000 / 1000 / 1000,
(double)(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1024 / 1024 / 1024 / 1024));
}
else if(((ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize) / 1024 / 1024) > 1000)
else if(ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize / 1024 / 1024 > 1000)
{
ataTwoValue.Add("Device size in 48-bit LBA mode",
string.Format("{0} bytes, {1} Gb, {2:F2} GiB",
ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize,
(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1000 / 1000 / 1000,
ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize / 1000 / 1000 / 1000,
(double)(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1024 / 1024 / 1024));
}
@@ -1778,8 +1778,8 @@ namespace DiscImageChef.Server.App_Start
ataTwoValue.Add("Device size in 48-bit LBA mode",
string.Format("{0} bytes, {1} Mb, {2:F2} MiB",
ataReport.ReadCapabilities.LBA48Sectors * logicalsectorsize,
(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1000 / 1000,
ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize / 1000 / 1000,
(double)(ataReport.ReadCapabilities.LBA48Sectors *
logicalsectorsize) / 1024 / 1024));
}

36
DiscImageChef.Server/App_Start/TestedMedia.cs
View File

@@ -75,20 +75,20 @@ namespace DiscImageChef.Server.App_Start
mediaOneValue.Add(string.Format("Medium has {0} blocks of {1} bytes each", testedMedia.Blocks,
testedMedia.BlockSize));
if(((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024) > 1000000)
if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000000)
{
mediaOneValue.Add(string.Format("Medium size: {0} bytes, {1} Tb, {2:F2} TiB",
testedMedia.Blocks * testedMedia.BlockSize,
(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 /
testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 /
1000 / 1000,
(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 /
1024 / 1024 / 1024));
}
else if(((testedMedia.Blocks * testedMedia.BlockSize) / 1024 / 1024) > 1000)
else if(testedMedia.Blocks * testedMedia.BlockSize / 1024 / 1024 > 1000)
{
mediaOneValue.Add(string.Format("Medium size: {0} bytes, {1} Gb, {2:F2} GiB",
testedMedia.Blocks * testedMedia.BlockSize,
(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000 /
testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000 /
1000,
(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 /
1024 / 1024));
@@ -97,7 +97,7 @@ namespace DiscImageChef.Server.App_Start
{
mediaOneValue.Add(string.Format("Medium size: {0} bytes, {1} Mb, {2:F2} MiB",
testedMedia.Blocks * testedMedia.BlockSize,
(testedMedia.Blocks * testedMedia.BlockSize) / 1000 / 1000,
testedMedia.Blocks * testedMedia.BlockSize / 1000 / 1000,
(double)(testedMedia.Blocks * testedMedia.BlockSize) / 1024 /
1024));
}
@@ -118,7 +118,7 @@ namespace DiscImageChef.Server.App_Start
testedMedia.CHS.Sectors, currentSectors));
mediaOneValue.Add(string.Format("Medium size in CHS mode: {0} bytes, {1} Mb, {2:F2} MiB",
(ulong)currentSectors * testedMedia.BlockSize,
((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000,
(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000,
(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 /
1024));
}
@@ -131,7 +131,7 @@ namespace DiscImageChef.Server.App_Start
mediaOneValue.Add(string.Format("Sectors addressable in CHS mode: {0}", currentSectors));
mediaOneValue.Add(string.Format("Medium size in CHS mode: {0} bytes, {1} Mb, {2:F2} MiB",
(ulong)currentSectors * testedMedia.BlockSize,
((ulong)currentSectors * testedMedia.BlockSize) / 1000 / 1000,
(ulong)currentSectors * testedMedia.BlockSize / 1000 / 1000,
(double)((ulong)currentSectors * testedMedia.BlockSize) / 1024 /
1024));
}
@@ -141,20 +141,20 @@ namespace DiscImageChef.Server.App_Start
mediaOneValue.Add(string.Format("Sectors addressable in sectors in 28-bit LBA mode: {0}",
testedMedia.LBASectors));
if((((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024) > 1000000)
if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
{
mediaOneValue.Add(string.Format("Medium size in 28-bit LBA mode: {0} bytes, {1} Tb, {2:F2} TiB",
(ulong)testedMedia.LBASectors * testedMedia.BlockSize,
((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 /
(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 /
1000 / 1000 / 1000,
(double)((ulong)testedMedia.LBASectors *
testedMedia.BlockSize) / 1024 / 1024 / 1024 / 1024));
}
else if((((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1024 / 1024) > 1000)
else if((ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
{
mediaOneValue.Add(string.Format("Medium size in 28-bit LBA mode: {0} bytes, {1} Gb, {2:F2} GiB",
(ulong)testedMedia.LBASectors * testedMedia.BlockSize,
((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 /
(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 /
1000 / 1000,
(double)((ulong)testedMedia.LBASectors *
testedMedia.BlockSize) / 1024 / 1024 / 1024));
@@ -163,7 +163,7 @@ namespace DiscImageChef.Server.App_Start
{
mediaOneValue.Add(string.Format("Medium size in 28-bit LBA mode: {0} bytes, {1} Mb, {2:F2} MiB",
(ulong)testedMedia.LBASectors * testedMedia.BlockSize,
((ulong)testedMedia.LBASectors * testedMedia.BlockSize) / 1000 /
(ulong)testedMedia.LBASectors * testedMedia.BlockSize / 1000 /
1000,
(double)((ulong)testedMedia.LBASectors *
testedMedia.BlockSize) / 1024 / 1024));
@@ -175,20 +175,20 @@ namespace DiscImageChef.Server.App_Start
mediaOneValue.Add(string.Format("Sectors addressable in sectors in 48-bit LBA mode: {0}",
testedMedia.LBA48Sectors));
if(((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024) > 1000000)
if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000000)
{
mediaOneValue.Add(string.Format("Medium size in 48-bit LBA mode: {0} bytes, {1} Tb, {2:F2} TiB",
testedMedia.LBA48Sectors * testedMedia.BlockSize,
(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 /
testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 /
1000 / 1000 / 1000,
(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) /
1024 / 1024 / 1024 / 1024));
}
else if(((testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1024 / 1024) > 1000)
else if(testedMedia.LBA48Sectors * testedMedia.BlockSize / 1024 / 1024 > 1000)
{
mediaOneValue.Add(string.Format("Medium size in 48-bit LBA mode: {0} bytes, {1} Gb, {2:F2} GiB",
testedMedia.LBA48Sectors * testedMedia.BlockSize,
(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 /
testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 /
1000 / 1000,
(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) /
1024 / 1024 / 1024));
@@ -197,7 +197,7 @@ namespace DiscImageChef.Server.App_Start
{
mediaOneValue.Add(string.Format("Medium size in 48-bit LBA mode: {0} bytes, {1} Mb, {2:F2} MiB",
testedMedia.LBA48Sectors * testedMedia.BlockSize,
(testedMedia.LBA48Sectors * testedMedia.BlockSize) / 1000 /
testedMedia.LBA48Sectors * testedMedia.BlockSize / 1000 /
1000,
(double)(testedMedia.LBA48Sectors * testedMedia.BlockSize) /
1024 / 1024));
@@ -212,7 +212,7 @@ namespace DiscImageChef.Server.App_Start
}
if(testedMedia.BlockSizeSpecified && testedMedia.PhysicalBlockSizeSpecified &&
(testedMedia.BlockSize != testedMedia.PhysicalBlockSize) &&
testedMedia.BlockSize != testedMedia.PhysicalBlockSize &&
(testedMedia.LogicalAlignment & 0x8000) == 0x0000 &&
(testedMedia.LogicalAlignment & 0x4000) == 0x4000)
{

20
DiscImageChef.Server/ViewReport.aspx.cs
View File

@@ -395,28 +395,28 @@ namespace DiscImageChef.Server
report.SCSI.ReadCapabilities.Blocks,
report.SCSI.ReadCapabilities.BlockSize));
if(((report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 /
1024) > 1000000)
if(report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1024 /
1024 > 1000000)
{
scsiOneValue.Add(string.Format("Device size: {0} bytes, {1} Tb, {2:F2} TiB",
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize,
(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000 /
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 /
1000 / 1000,
(double)(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1024 /
1024 / 1024 / 1024));
}
else if(
((report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize) / 1024 /
1024) > 1000)
report.SCSI.ReadCapabilities.Blocks * report.SCSI.ReadCapabilities.BlockSize / 1024 /
1024 > 1000)
{
scsiOneValue.Add(string.Format("Device size: {0} bytes, {1} Gb, {2:F2} GiB",
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize,
(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000 /
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000 /
1000,
(double)(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1024 /
@@ -427,8 +427,8 @@ namespace DiscImageChef.Server
scsiOneValue.Add(string.Format("Device size: {0} bytes, {1} Mb, {2:F2} MiB",
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize,
(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1000 / 1000,
report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize / 1000 / 1000,
(double)(report.SCSI.ReadCapabilities.Blocks *
report.SCSI.ReadCapabilities.BlockSize) / 1024 /
1024));