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

12
DiscImageChef/Commands/Checksum.cs
View File

@@ -114,7 +114,7 @@ namespace DiscImageChef.Commands
List<Track> inputTracks = inputFormat.GetTracks();
foreach(Track currentTrack in inputTracks)
{
if((currentTrack.TrackStartSector - previousTrackEnd) != 0 && options.WholeDisc)
if(currentTrack.TrackStartSector - previousTrackEnd != 0 && options.WholeDisc)
{
for(ulong i = previousTrackEnd + 1; i < currentTrack.TrackStartSector; i++)
{
@@ -141,7 +141,7 @@ namespace DiscImageChef.Commands
{
byte[] sector;
if((sectors - doneSectors) >= SECTORS_TO_READ)
if(sectors - doneSectors >= SECTORS_TO_READ)
{
sector = inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ,
currentTrack.TrackSequence);
@@ -155,7 +155,7 @@ namespace DiscImageChef.Commands
currentTrack.TrackSequence);
DicConsole.Write("\rHashings sectors {0} to {2} of track {1}", doneSectors,
currentTrack.TrackSequence, doneSectors + (sectors - doneSectors));
doneSectors += (sectors - doneSectors);
doneSectors += sectors - doneSectors;
}
if(options.WholeDisc) mediaChecksum.Update(sector);
@@ -175,7 +175,7 @@ namespace DiscImageChef.Commands
previousTrackEnd = currentTrack.TrackEndSector;
}
if((inputFormat.GetSectors() - previousTrackEnd) != 0 && options.WholeDisc)
if(inputFormat.GetSectors() - previousTrackEnd != 0 && options.WholeDisc)
{
for(ulong i = previousTrackEnd + 1; i < inputFormat.GetSectors(); i++)
{
@@ -210,7 +210,7 @@ namespace DiscImageChef.Commands
{
byte[] sector;
if((sectors - doneSectors) >= SECTORS_TO_READ)
if(sectors - doneSectors >= SECTORS_TO_READ)
{
sector = inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ);
DicConsole.Write("\rHashings sectors {0} to {1}", doneSectors, doneSectors + SECTORS_TO_READ);
@@ -221,7 +221,7 @@ namespace DiscImageChef.Commands
sector = inputFormat.ReadSectors(doneSectors, (uint)(sectors - doneSectors));
DicConsole.Write("\rHashings sectors {0} to {1}", doneSectors,
doneSectors + (sectors - doneSectors));
doneSectors += (sectors - doneSectors);
doneSectors += sectors - doneSectors;
}
mediaChecksum.Update(sector);

10
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -224,7 +224,7 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Media card is write protected");
ushort specificData =
(ushort)((errorRegisters.cylinderHigh * 0x100) + errorRegisters.cylinderLow);
(ushort)(errorRegisters.cylinderHigh * 0x100 + errorRegisters.cylinderLow);
if(specificData != 0) DicConsole.WriteLine("Card specific data: 0x{0:X4}", specificData);
}
@@ -1319,18 +1319,18 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Drive has loaded a total of {0} discs", discs);
DicConsole
.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading CDs",
cdReadTime / 3600, (cdReadTime / 60) % 60, cdReadTime % 60);
cdReadTime / 3600, cdReadTime / 60 % 60, cdReadTime % 60);
DicConsole
.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing CDs",
cdWriteTime / 3600, (cdWriteTime / 60) % 60, cdWriteTime % 60);
cdWriteTime / 3600, cdWriteTime / 60 % 60, cdWriteTime % 60);
if(plxtDvd)
{
DicConsole
.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading DVDs",
dvdReadTime / 3600, (dvdReadTime / 60) % 60, dvdReadTime % 60);
dvdReadTime / 3600, dvdReadTime / 60 % 60, dvdReadTime % 60);
DicConsole
.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing DVDs",
dvdWriteTime / 3600, (dvdWriteTime / 60) % 60, dvdWriteTime % 60);
dvdWriteTime / 3600, dvdWriteTime / 60 % 60, dvdWriteTime % 60);
}
}

14
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -237,8 +237,8 @@ namespace DiscImageChef.Commands
{
DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity.bin", "SCSI READ CAPACITY",
cmdBuf);
blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + (cmdBuf[3]));
blockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + (cmdBuf[7]));
blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]);
blockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
}
if(sense || blocks == 0xFFFFFFFF)
@@ -264,7 +264,7 @@ namespace DiscImageChef.Commands
Array.Copy(cmdBuf, 0, temp, 0, 8);
Array.Reverse(temp);
blocks = BitConverter.ToUInt64(temp, 0);
blockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + (cmdBuf[7]));
blockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
}
}
@@ -1234,7 +1234,7 @@ namespace DiscImageChef.Commands
}
#region Xbox
if((dskType == MediaType.XGD || dskType == MediaType.XGD2 || dskType == MediaType.XGD3))
if(dskType == MediaType.XGD || dskType == MediaType.XGD2 || dskType == MediaType.XGD3)
{
// We need to get INQUIRY to know if it is a Kreon drive
byte[] inqBuffer;
@@ -1275,7 +1275,7 @@ namespace DiscImageChef.Commands
return;
}
totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + (cmdBuf[3]));
totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]);
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PhysicalInformation, 0, 0, out duration);
if(sense)
@@ -1306,7 +1306,7 @@ namespace DiscImageChef.Commands
return;
}
gameSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + (cmdBuf[3])) + 1;
gameSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) + 1;
DicConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors",
gameSize);
@@ -1326,7 +1326,7 @@ namespace DiscImageChef.Commands
return;
}
totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + (cmdBuf[3]));
totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]);
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PhysicalInformation, 0, 0, out duration);
if(sense)