REFACTOR: Use preferred braces style.

This commit is contained in:
2017-12-21 00:44:33 +00:00
parent e9443388ee
commit bce69c9161
171 changed files with 5 additions and 1412 deletions

View File

@@ -282,16 +282,12 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("CPCDSK plugin", "header.sides = {0}", header.sides);
if(!extended) DicConsole.DebugWriteLine("CPCDSK plugin", "header.tracksize = {0}", header.tracksize);
else
{
for(int i = 0; i < header.tracks; i++)
{
for(int j = 0; j < header.sides; j++)
{
DicConsole.DebugWriteLine("CPCDSK plugin", "Track {0} Side {1} size = {2}", i, j,
header.tracksizeTable[i * header.sides + j] * 256);
}
}
}
ulong currentSector = 0;
sectors = new Dictionary<ulong, byte[]>();
@@ -345,10 +341,8 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i, j);
if(trackInfo.sectors != sectorsPerTrack)
{
if(sectorsPerTrack == 0) sectorsPerTrack = trackInfo.sectors;
else allTracksSameSize = false;
}
byte[][] thisTrackSectors = new byte[trackInfo.sectors][];
byte[][] thisTrackAddressMarks = new byte[trackInfo.sectors][];

View File

@@ -143,10 +143,8 @@ namespace DiscImageChef.DiscImages
stream.Read(trackBytes, 0, tracks);
for(int i = 0; i < tracks; i++)
{
if(trackBytes[i] != (byte)TrackType.Copied && trackBytes[i] != (byte)TrackType.Omitted &&
trackBytes[i] != (byte)TrackType.OmittedAlternate) return false;
}
Compression cmpr = (Compression)stream.ReadByte();

View File

@@ -403,7 +403,6 @@ namespace DiscImageChef.DiscImages
ImageInfo.MediaType = MediaType.Unknown;
if(allEqual)
{
if(trkCounter == 154 && spt == 26 && bps == IBMSectorSizeCode.EighthKilo)
ImageInfo.MediaType = MediaType.NEC_8_SD;
else if(bps == IBMSectorSizeCode.QuarterKilo)
@@ -415,7 +414,6 @@ namespace DiscImageChef.DiscImages
else if(trkCounter == 154 && spt == 8 && bps == IBMSectorSizeCode.Kilo)
ImageInfo.MediaType = MediaType.NEC_525_HD;
else if(bps == IBMSectorSizeCode.HalfKilo)
{
switch(d88Hdr.track_table.Length)
{
case 40:
@@ -470,8 +468,6 @@ namespace DiscImageChef.DiscImages
if(spt == 38) ImageInfo.MediaType = MediaType.NEC_35_TD;
break;
}
}
}
DicConsole.DebugWriteLine("D88 plugin", "MediaType: {0}", ImageInfo.MediaType);

View File

@@ -250,7 +250,6 @@ namespace DiscImageChef.DiscImages
MemoryStream tagMs = new MemoryStream();
for(int i = 0; i < bLength.Length; i++)
{
if(bLength[i] != 0)
{
buffer = new byte[BUFFER_SIZE];
@@ -273,7 +272,6 @@ namespace DiscImageChef.DiscImages
throw new ImageNotSupportedException("Compressed images not yet supported");
}
}
}
dataCache = dataMs.ToArray();
if(header.srcType == DISK_LISA || header.srcType == DISK_MAC || header.srcType == DISK_APPLE2)

View File

@@ -207,7 +207,6 @@ namespace DiscImageChef.DiscImages
: string.Format("{0}{1:D2}.{2:D1}.raw", basename, cylinder, head);
if(!File.Exists(trackfile))
{
if(cylinder == 0)
{
if(head == 0)
@@ -236,7 +235,6 @@ namespace DiscImageChef.DiscImages
step = 2;
break;
}
}
ZZZNoFilter trackFilter = new ZZZNoFilter();
trackFilter.Open(trackfile);
@@ -301,10 +299,8 @@ namespace DiscImageChef.DiscImages
foundDate = true;
}
else if(kvp[0] == hostTime)
{
DateTime.TryParseExact(kvp[1], "HH:mm:ss", CultureInfo.InvariantCulture,
DateTimeStyles.AssumeLocal, out blockTime);
}
else if(kvp[0] == kfName) ImageInfo.ImageApplication = kvp[1];
else if(kvp[0] == kfVersion) ImageInfo.ImageApplicationVersion = kvp[1];
}

View File

@@ -521,14 +521,12 @@ namespace DiscImageChef.DiscImages
ulong chunkStartSector = 0;
foreach(KeyValuePair<ulong, BlockChunk> kvp in chunks)
{
if(sectorAddress >= kvp.Key)
{
currentChunk = kvp.Value;
chunkFound = true;
chunkStartSector = kvp.Key;
}
}
long relOff = ((long)sectorAddress - (long)chunkStartSector) * SECTOR_SIZE;

View File

@@ -238,8 +238,6 @@ namespace DiscImageChef.DiscImages
// For empty cylinders
if(sectorsOff[cyl][head].Length == 0)
{
// Last cylinder
if(cyl + 1 == hdr.cylinders ||
// Next cylinder is also empty
sectorsOff[cyl + 1][head].Length == 0) emptyCyl = true;
@@ -249,7 +247,6 @@ namespace DiscImageChef.DiscImages
sectorsData[cyl][head] = new byte[spt][];
for(int i = 0; i < spt; i++) sectorsData[cyl][head][i] = new byte[ImageInfo.SectorSize];
}
}
}
if(emptyCyl) ImageInfo.Cylinders--;

View File

@@ -726,14 +726,12 @@ namespace DiscImageChef.DiscImages
ulong extentStartSector = 0;
foreach(KeyValuePair<ulong, VMwareExtent> kvp in extents)
{
if(sectorAddress >= kvp.Key)
{
currentExtent = kvp.Value;
extentFound = true;
extentStartSector = kvp.Key;
}
}
if(!extentFound)
throw new ArgumentOutOfRangeException(nameof(sectorAddress),