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: Use preferred braces style.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-20 23:07:46 +00:00
parent 4158d64854
commit e9443388ee
120 changed files with 1016 additions and 1975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,6 @@ namespace DiscImageChef.Devices
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
resolvedLink = "/sys" + resolvedLink.Substring(2);
if(!string.IsNullOrEmpty(resolvedLink))
{
while(resolvedLink.Contains("usb"))
{
resolvedLink = System.IO.Path.GetDirectoryName(resolvedLink);
@@ -435,7 +434,6 @@ namespace DiscImageChef.Devices
break;
}
}
}
}
}
}
@@ -482,7 +480,6 @@ namespace DiscImageChef.Devices
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
resolvedLink = "/sys" + resolvedLink.Substring(2);
if(!string.IsNullOrEmpty(resolvedLink))
{
while(resolvedLink.Contains("firewire"))
{
resolvedLink = System.IO.Path.GetDirectoryName(resolvedLink);
@@ -530,7 +527,6 @@ namespace DiscImageChef.Devices
break;
}
}
}
}
}
}
@@ -551,7 +547,6 @@ namespace DiscImageChef.Devices
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
resolvedLink = "/sys" + resolvedLink.Substring(2);
if(!string.IsNullOrEmpty(resolvedLink))
{
while(resolvedLink.Contains("/sys/devices"))
{
resolvedLink = System.IO.Path.GetDirectoryName(resolvedLink);
@@ -586,7 +581,6 @@ namespace DiscImageChef.Devices
}
}
}
}
}
}
}
@@ -656,11 +650,9 @@ namespace DiscImageChef.Devices
scsiType = Decoders.SCSI.PeripheralDeviceTypes.DirectAccess;
if((ushort)ataid.Value.GeneralConfiguration != 0x848A)
{
removable |=
(ataid.Value.GeneralConfiguration & Identify.GeneralConfigurationBit.Removable) ==
Identify.GeneralConfigurationBit.Removable;
}
else compactFlash = true;
}
}
@@ -679,7 +671,7 @@ namespace DiscImageChef.Devices
if(string.IsNullOrEmpty(manufacturer)) manufacturer = usbManufacturerString;
if(string.IsNullOrEmpty(model)) model = usbProductString;
if(string.IsNullOrEmpty(serial)) serial = usbSerialString;
else { foreach(char c in serial) { if(char.IsControl(c)) serial = usbSerialString; } }
else foreach(char c in serial) if(char.IsControl(c)) serial = usbSerialString;
}
if(firewire)
@@ -687,10 +679,7 @@ namespace DiscImageChef.Devices
if(string.IsNullOrEmpty(manufacturer)) manufacturer = firewireVendorName;
if(string.IsNullOrEmpty(model)) model = firewireModelName;
if(string.IsNullOrEmpty(serial)) serial = string.Format("{0:X16}", firewireGuid);
else
{
foreach(char c in serial) { if(char.IsControl(c)) serial = string.Format("{0:X16}", firewireGuid); }
}
else foreach(char c in serial) if(char.IsControl(c)) serial = string.Format("{0:X16}", firewireGuid);
}
}

4
DiscImageChef.Devices/Device/ScsiCommands/SyQuest.cs
View File

@@ -97,10 +97,8 @@ namespace DiscImageChef.Devices
if(readLong) cdb[5] += 0x40;
if(!inhibitDma && !readLong)
{
if(transferLength == 0) buffer = new byte[256 * blockSize];
else buffer = new byte[transferLength * blockSize];
}
else if(readLong)
{
buffer = new byte[blockSize];
@@ -182,7 +180,7 @@ namespace DiscImageChef.Devices
if(inhibitDma) cdb[9] += 0x80;
if(readLong) cdb[9] += 0x40;
if(!inhibitDma && !readLong) { buffer = new byte[transferLength * blockSize]; }
if(!inhibitDma && !readLong) buffer = new byte[transferLength * blockSize];
else if(readLong)
{
buffer = new byte[blockSize];