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

20
DiscImageChef.Devices/Command.cs
View File

@@ -174,12 +174,10 @@ namespace DiscImageChef.Devices
{
case Interop.PlatformID.Win32NT:
{
if(( // Windows XP <= SP1
Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
(Environment.OSVersion.ServicePack == "Service Pack 1" ||
Environment.OSVersion.ServicePack == "")) || ( // Windows 2000
Environment.OSVersion.Version.Major == 5 &&
Environment.OSVersion.Version.Minor == 0))
if(Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
(Environment.OSVersion.ServicePack == "Service Pack 1" ||
Environment.OSVersion.ServicePack == "") || Environment.OSVersion.Version.Major == 5 &&
Environment.OSVersion.Version.Minor == 0)
return Windows.Command.SendIdeCommand((SafeFileHandle)fd, registers, out errorRegisters,
protocol, ref buffer, timeout, out duration, out sense);
// Windows NT 4 or earlier, requires special ATA pass thru SCSI. But DiscImageChef cannot run there (or can it?)
@@ -224,12 +222,10 @@ namespace DiscImageChef.Devices
{
case Interop.PlatformID.Win32NT:
{
if(( // Windows XP <= SP1
Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
(Environment.OSVersion.ServicePack == "Service Pack 1" ||
Environment.OSVersion.ServicePack == "")) || ( // Windows 2000
Environment.OSVersion.Version.Major == 5 &&
Environment.OSVersion.Version.Minor == 0))
if(Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
(Environment.OSVersion.ServicePack == "Service Pack 1" ||
Environment.OSVersion.ServicePack == "") || Environment.OSVersion.Version.Major == 5 &&
Environment.OSVersion.Version.Minor == 0)
return Windows.Command.SendIdeCommand((SafeFileHandle)fd, registers, out errorRegisters,
protocol, ref buffer, timeout, out duration, out sense);
// Windows NT 4 or earlier, requires special ATA pass thru SCSI. But DiscImageChef cannot run there (or can it?)

2
DiscImageChef.Devices/Device/Constructor.cs
View File

@@ -631,7 +631,7 @@ namespace DiscImageChef.Devices
}
}
if((scsiSense && (usb || firewire)) || manufacturer == "ATA")
if(scsiSense && (usb || firewire) || manufacturer == "ATA")
{
bool ataSense = AtaIdentify(out ataBuf, out errorRegisters);
if(!ataSense)

2
DiscImageChef.Devices/FreeBSD/Command.cs
View File

@@ -456,7 +456,7 @@ namespace DiscImageChef.Devices.FreeBSD
errorRegisters = new AtaErrorRegistersLBA48();
// 48-bit ATA CAM commands can crash FreeBSD < 9.2-RELEASE
if((System.Environment.Version.Major == 9 && System.Environment.Version.Minor < 2) ||
if(System.Environment.Version.Major == 9 && System.Environment.Version.Minor < 2 ||
System.Environment.Version.Major < 9) return -1;
if(buffer == null) return -1;

6
DiscImageChef.Devices/Linux/Command.cs
View File

@@ -164,7 +164,7 @@ namespace DiscImageChef.Devices.Linux
int error = SendScsiCommand(fd, cdb, ref buffer, out senseBuffer, timeout,
AtaProtocolToScsiDirection(protocol), out duration, out sense);
if(senseBuffer.Length < 22 || (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C)) return error;
if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
errorRegisters.error = senseBuffer[11];
@@ -226,7 +226,7 @@ namespace DiscImageChef.Devices.Linux
int error = SendScsiCommand(fd, cdb, ref buffer, out senseBuffer, timeout,
AtaProtocolToScsiDirection(protocol), out duration, out sense);
if(senseBuffer.Length < 22 || (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C)) return error;
if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
errorRegisters.error = senseBuffer[11];
@@ -294,7 +294,7 @@ namespace DiscImageChef.Devices.Linux
int error = SendScsiCommand(fd, cdb, ref buffer, out senseBuffer, timeout,
AtaProtocolToScsiDirection(protocol), out duration, out sense);
if(senseBuffer.Length < 22 || (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C)) return error;
if(senseBuffer.Length < 22 || senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C) return error;
errorRegisters.error = senseBuffer[11];

4
DiscImageChef.Devices/Windows/Usb.cs
View File

@@ -778,7 +778,7 @@ namespace DiscImageChef.Devices.Windows
UsbDeviceSpeed speed = (UsbDeviceSpeed)nodeConnection.Speed;
port.PortSpeed = speed.ToString();
port.PortIsDeviceConnected =
(nodeConnection.ConnectionStatus == (int)UsbConnectionStatus.DeviceConnected);
nodeConnection.ConnectionStatus == (int)UsbConnectionStatus.DeviceConnected;
port.PortIsHub = Convert.ToBoolean(nodeConnection.DeviceIsHub);
port.PortDeviceDescriptor = nodeConnection.DeviceDescriptor;
@@ -964,7 +964,7 @@ namespace DiscImageChef.Devices.Windows
// build a request for configuration descriptor
UsbDescriptorRequest dcrRequest = new UsbDescriptorRequest();
dcrRequest.ConnectionIndex = PortPortNumber;
dcrRequest.SetupPacket.wValue = (short)((USB_CONFIGURATION_DESCRIPTOR_TYPE << 8));
dcrRequest.SetupPacket.wValue = (short)(USB_CONFIGURATION_DESCRIPTOR_TYPE << 8);
dcrRequest.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(dcrRequest));
dcrRequest.SetupPacket.wIndex = 0;
// Geez, I wish C# had a Marshal.MemSet() method