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

REFACTOR: Removed else statements.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 02:57:32 +00:00
parent f0e80721ed
commit ff5540ff5d
13 changed files with 183 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Checksums/CDChecksums.cs
View File

@@ -142,7 +142,8 @@ namespace DiscImageChef.Checksums
return true;
}
else if(channel[0x00F] == 0x01) // mode (1 byte)
if(channel[0x00F] == 0x01) // mode (1 byte)
{
DicConsole.DebugWriteLine("CD checksums", "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
channel[0x00C], channel[0x00D], channel[0x00E]);
@@ -200,7 +201,8 @@ namespace DiscImageChef.Checksums
return true;
}
else if(channel[0x00F] == 0x02) // mode (1 byte)
if(channel[0x00F] == 0x02) // mode (1 byte)
{
DicConsole.DebugWriteLine("CD checksums", "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
channel[0x00C], channel[0x00D], channel[0x00E]);
@@ -281,13 +283,11 @@ namespace DiscImageChef.Checksums
return true;
}
else
{
DicConsole.DebugWriteLine("CD checksums",
"Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]);
return null;
}
DicConsole.DebugWriteLine("CD checksums",
"Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]);
return null;
}
return null;

2
DiscImageChef.CommonTypes/Partition.cs
View File

@@ -71,7 +71,7 @@ namespace DiscImageChef.CommonTypes
public override bool Equals(object obj)
{
if(obj == null || !(obj is Partition)) return false;
else return Equals((Partition)obj);
return Equals((Partition)obj);
}
public override int GetHashCode()

13
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -365,15 +365,12 @@ namespace DiscImageChef.Core.Devices.Dumping
}
if(dumpRaw) throw new NotImplementedException("Raw CD dumping not yet implemented");
else
{
// TODO: Check subchannel capabilities
readcd = !dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 1, MmcSectorTypes.AllTypes, false,
false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
MmcSubchannel.Raw, dev.Timeout, out duration);
// TODO: Check subchannel capabilities
readcd = !dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 1, MmcSectorTypes.AllTypes, false,
false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
MmcSubchannel.Raw, dev.Timeout, out duration);
if(readcd) DicConsole.WriteLine("Using MMC READ CD command.");
}
if(readcd) DicConsole.WriteLine("Using MMC READ CD command.");
DumpHardwareType currentTry = null;
ExtentsULong extents = null;

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

@@ -421,8 +421,8 @@ namespace DiscImageChef.Devices
if(prevent)
return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout,
out duration);
else
return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
}
/// <summary>

64
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -727,47 +727,45 @@ namespace DiscImageChef.DiscImages
throw new
FeatureUnsupportedImageException(string.Format("Found INDEX before a track {0}",
line));
else
{
int index = int.Parse(matchIndex.Groups[1].Value);
ulong offset = CdrWinMsftoLba(matchIndex.Groups[2].Value);
if(index != 0 && index != 1 && currenttrack.Indexes.Count == 0)
throw new
FeatureUnsupportedImageException(string
.Format("Found INDEX {0} before INDEX 00 or INDEX 01",
index));
int index = int.Parse(matchIndex.Groups[1].Value);
ulong offset = CdrWinMsftoLba(matchIndex.Groups[2].Value);
if(index == 0 || index == 1 && !currenttrack.Indexes.ContainsKey(0))
if((int)(currenttrack.Sequence - 2) >= 0 && offset > 1)
{
cuetracks[currenttrack.Sequence - 2].Sectors = offset - currentfileoffsetsector;
currentfile.Offset +=
cuetracks[currenttrack.Sequence - 2].Sectors *
cuetracks[currenttrack.Sequence - 2].Bps;
DicConsole.DebugWriteLine("CDRWin plugin",
"Sets currentfile.offset to {0} at line 553",
currentfile.Offset);
DicConsole.DebugWriteLine("CDRWin plugin",
"cuetracks[currenttrack.sequence-2].sectors = {0}",
cuetracks[currenttrack.Sequence - 2].Sectors);
DicConsole.DebugWriteLine("CDRWin plugin",
"cuetracks[currenttrack.sequence-2].bps = {0}",
cuetracks[currenttrack.Sequence - 2].Bps);
}
if(index != 0 && index != 1 && currenttrack.Indexes.Count == 0)
throw new
FeatureUnsupportedImageException(string
.Format("Found INDEX {0} before INDEX 00 or INDEX 01",
index));
if((index == 0 || index == 1 && !currenttrack.Indexes.ContainsKey(0)) &&
currenttrack.Sequence == 1)
if(index == 0 || index == 1 && !currenttrack.Indexes.ContainsKey(0))
if((int)(currenttrack.Sequence - 2) >= 0 && offset > 1)
{
cuetracks[currenttrack.Sequence - 2].Sectors = offset - currentfileoffsetsector;
currentfile.Offset +=
cuetracks[currenttrack.Sequence - 2].Sectors *
cuetracks[currenttrack.Sequence - 2].Bps;
DicConsole.DebugWriteLine("CDRWin plugin",
"Sets currentfile.offset to {0} at line 559",
offset * currenttrack.Bps);
currentfile.Offset = offset * currenttrack.Bps;
"Sets currentfile.offset to {0} at line 553",
currentfile.Offset);
DicConsole.DebugWriteLine("CDRWin plugin",
"cuetracks[currenttrack.sequence-2].sectors = {0}",
cuetracks[currenttrack.Sequence - 2].Sectors);
DicConsole.DebugWriteLine("CDRWin plugin",
"cuetracks[currenttrack.sequence-2].bps = {0}",
cuetracks[currenttrack.Sequence - 2].Bps);
}
currentfileoffsetsector = offset;
currenttrack.Indexes.Add(index, offset);
if((index == 0 || index == 1 && !currenttrack.Indexes.ContainsKey(0)) &&
currenttrack.Sequence == 1)
{
DicConsole.DebugWriteLine("CDRWin plugin",
"Sets currentfile.offset to {0} at line 559",
offset * currenttrack.Bps);
currentfile.Offset = offset * currenttrack.Bps;
}
currentfileoffsetsector = offset;
currenttrack.Indexes.Add(index, offset);
}
else if(matchIsrc.Success)
{

6
DiscImageChef.DiscImages/TeleDisk.cs
View File

@@ -1153,7 +1153,8 @@ namespace DiscImageChef.DiscImages
throw new FeatureNotPresentImageException("Lead-out not present in disk image");
}
else throw new FeatureUnsupportedImageException("Feature not supported by image format");
throw new FeatureUnsupportedImageException("Feature not supported by image format");
}
#endregion
@@ -1442,7 +1443,8 @@ namespace DiscImageChef.DiscImages
getbuf <<= 1;
getlen--;
if(i < 0) return 1;
else return 0;
return 0;
}
int GetByte() /* get a byte */

2
DiscImageChef.DiscImages/VHD.cs
View File

@@ -921,7 +921,7 @@ namespace DiscImageChef.DiscImages
if(!locatorFound || parentPath == null)
throw new
FileNotFoundException("(VirtualPC plugin): Cannot find parent file for differencing disk image");
else
{
parentImage = new Vhd();
Filter parentFilter =

202
DiscImageChef.DiscImages/ZZZRawImage.cs
View File

@@ -672,24 +672,22 @@ namespace DiscImageChef.DiscImages
public override byte[] ReadSectors(ulong sectorAddress, uint length)
{
if(differentTrackZeroSize) throw new NotImplementedException("Not yet implemented");
else
{
if(sectorAddress > ImageInfo.Sectors - 1)
throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
if(sectorAddress + length > ImageInfo.Sectors)
throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
if(sectorAddress > ImageInfo.Sectors - 1)
throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
byte[] buffer = new byte[length * ImageInfo.SectorSize];
if(sectorAddress + length > ImageInfo.Sectors)
throw new ArgumentOutOfRangeException(nameof(length), "Requested more sectors than available");
Stream stream = rawImageFilter.GetDataForkStream();
byte[] buffer = new byte[length * ImageInfo.SectorSize];
stream.Seek((long)(sectorAddress * ImageInfo.SectorSize), SeekOrigin.Begin);
Stream stream = rawImageFilter.GetDataForkStream();
stream.Read(buffer, 0, (int)(length * ImageInfo.SectorSize));
stream.Seek((long)(sectorAddress * ImageInfo.SectorSize), SeekOrigin.Begin);
return buffer;
}
stream.Read(buffer, 0, (int)(length * ImageInfo.SectorSize));
return buffer;
}
public override string GetImageFormat()
@@ -915,104 +913,104 @@ namespace DiscImageChef.DiscImages
return MediaType.Unknown;
}
else
switch(ImageInfo.ImageSize)
{
case 80384: return MediaType.ECMA_66;
case 81664: return MediaType.IBM23FD;
case 92160: return MediaType.ATARI_525_SD;
case 102400: return MediaType.ACORN_525_SS_SD_40;
case 116480: return MediaType.Apple32SS;
case 133120: return MediaType.ATARI_525_ED;
case 143360: return MediaType.Apple33SS;
case 163840:
if(ImageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_40;
return MediaType.DOS_525_SS_DD_8;
case 184320: return MediaType.DOS_525_SS_DD_9;
case 204800: return MediaType.ACORN_525_SS_SD_80;
case 232960: return MediaType.Apple32DS;
case 242944: return MediaType.IBM33FD_128;
case 256256: return MediaType.ECMA_54;
case 286720: return MediaType.Apple33DS;
case 287488: return MediaType.IBM33FD_256;
case 306432: return MediaType.IBM33FD_512;
case 322560: return MediaType.Apricot_35;
case 325632: return MediaType.ECMA_70;
case 327680:
if(ImageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_80;
switch(ImageInfo.ImageSize)
{
case 80384: return MediaType.ECMA_66;
case 81664: return MediaType.IBM23FD;
case 92160: return MediaType.ATARI_525_SD;
case 102400: return MediaType.ACORN_525_SS_SD_40;
case 116480: return MediaType.Apple32SS;
case 133120: return MediaType.ATARI_525_ED;
case 143360: return MediaType.Apple33SS;
case 163840:
if(ImageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_40;
return MediaType.DOS_525_DS_DD_8;
case 368640:
if(extension == ".st") return MediaType.DOS_35_SS_DD_9;
return MediaType.DOS_525_SS_DD_8;
case 184320: return MediaType.DOS_525_SS_DD_9;
case 204800: return MediaType.ACORN_525_SS_SD_80;
case 232960: return MediaType.Apple32DS;
case 242944: return MediaType.IBM33FD_128;
case 256256: return MediaType.ECMA_54;
case 286720: return MediaType.Apple33DS;
case 287488: return MediaType.IBM33FD_256;
case 306432: return MediaType.IBM33FD_512;
case 322560: return MediaType.Apricot_35;
case 325632: return MediaType.ECMA_70;
case 327680:
if(ImageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_80;
return MediaType.DOS_525_DS_DD_9;
case 409600:
if(extension == ".st") return MediaType.ATARI_35_SS_DD;
return MediaType.DOS_525_DS_DD_8;
case 368640:
if(extension == ".st") return MediaType.DOS_35_SS_DD_9;
return MediaType.AppleSonySS;
case 450560: return MediaType.ATARI_35_SS_DD_11;
case 495872: return MediaType.IBM43FD_128;
case 512512: return MediaType.ECMA_59;
case 653312: return MediaType.ECMA_78;
case 655360: return MediaType.ACORN_525_DS_DD;
case 737280: return MediaType.DOS_35_DS_DD_9;
case 819200:
if(ImageInfo.SectorSize == 256) return MediaType.CBM_35_DD;
if((extension == ".adf" || extension == ".adl") && ImageInfo.SectorSize == 1024)
return MediaType.ACORN_35_DS_DD;
if(extension == ".st") return MediaType.ATARI_35_DS_DD;
return MediaType.DOS_525_DS_DD_9;
case 409600:
if(extension == ".st") return MediaType.ATARI_35_SS_DD;
return MediaType.AppleSonyDS;
case 839680: return MediaType.FDFORMAT_35_DD;
case 901120:
if(extension == ".st") return MediaType.ATARI_35_DS_DD_11;
return MediaType.AppleSonySS;
case 450560: return MediaType.ATARI_35_SS_DD_11;
case 495872: return MediaType.IBM43FD_128;
case 512512: return MediaType.ECMA_59;
case 653312: return MediaType.ECMA_78;
case 655360: return MediaType.ACORN_525_DS_DD;
case 737280: return MediaType.DOS_35_DS_DD_9;
case 819200:
if(ImageInfo.SectorSize == 256) return MediaType.CBM_35_DD;
if((extension == ".adf" || extension == ".adl") && ImageInfo.SectorSize == 1024)
return MediaType.ACORN_35_DS_DD;
if(extension == ".st") return MediaType.ATARI_35_DS_DD;
return MediaType.CBM_AMIGA_35_DD;
case 988416: return MediaType.IBM43FD_256;
case 995072: return MediaType.IBM53FD_256;
case 1021696: return MediaType.ECMA_99_26;
case 1146624: return MediaType.IBM53FD_512;
case 1177344: return MediaType.ECMA_99_15;
case 1222400: return MediaType.IBM53FD_1024;
case 1228800: return MediaType.DOS_525_HD;
case 1255168: return MediaType.ECMA_69_8;
case 1261568: return MediaType.NEC_525_HD;
case 1304320: return MediaType.ECMA_99_8;
case 1427456: return MediaType.FDFORMAT_525_HD;
case 1474560: return MediaType.DOS_35_HD;
case 1638400: return MediaType.ACORN_35_DS_HD;
case 1720320: return MediaType.DMF;
case 1763328: return MediaType.FDFORMAT_35_HD;
case 1802240: return MediaType.CBM_AMIGA_35_HD;
case 1880064: return MediaType.XDF_35;
case 1884160: return MediaType.XDF_35;
case 2949120: return MediaType.DOS_35_ED;
case 9338880: return MediaType.NEC_35_TD;
case 33554432: return MediaType.FD32MB;
case 40387584: return MediaType.PocketZip;
case 126222336: return MediaType.LS120;
case 127923200: return MediaType.ECMA_154;
case 201410560: return MediaType.HiFD;
case 229632000: return MediaType.ECMA_201;
case 240386048: return MediaType.LS240;
case 481520640: return MediaType.ECMA_183_512;
case 533403648: return MediaType.ECMA_183;
case 596787200: return MediaType.ECMA_184_512;
case 654540800: return MediaType.ECMA_184;
case 1070617600: return MediaType.Jaz;
return MediaType.AppleSonyDS;
case 839680: return MediaType.FDFORMAT_35_DD;
case 901120:
if(extension == ".st") return MediaType.ATARI_35_DS_DD_11;
#region Commodore
case 174848:
case 175531: return MediaType.CBM_1540;
case 196608:
case 197376: return MediaType.CBM_1540_Ext;
case 349696:
case 351062: return MediaType.CBM_1571;
#endregion Commodore
return MediaType.CBM_AMIGA_35_DD;
case 988416: return MediaType.IBM43FD_256;
case 995072: return MediaType.IBM53FD_256;
case 1021696: return MediaType.ECMA_99_26;
case 1146624: return MediaType.IBM53FD_512;
case 1177344: return MediaType.ECMA_99_15;
case 1222400: return MediaType.IBM53FD_1024;
case 1228800: return MediaType.DOS_525_HD;
case 1255168: return MediaType.ECMA_69_8;
case 1261568: return MediaType.NEC_525_HD;
case 1304320: return MediaType.ECMA_99_8;
case 1427456: return MediaType.FDFORMAT_525_HD;
case 1474560: return MediaType.DOS_35_HD;
case 1638400: return MediaType.ACORN_35_DS_HD;
case 1720320: return MediaType.DMF;
case 1763328: return MediaType.FDFORMAT_35_HD;
case 1802240: return MediaType.CBM_AMIGA_35_HD;
case 1880064: return MediaType.XDF_35;
case 1884160: return MediaType.XDF_35;
case 2949120: return MediaType.DOS_35_ED;
case 9338880: return MediaType.NEC_35_TD;
case 33554432: return MediaType.FD32MB;
case 40387584: return MediaType.PocketZip;
case 126222336: return MediaType.LS120;
case 127923200: return MediaType.ECMA_154;
case 201410560: return MediaType.HiFD;
case 229632000: return MediaType.ECMA_201;
case 240386048: return MediaType.LS240;
case 481520640: return MediaType.ECMA_183_512;
case 533403648: return MediaType.ECMA_183;
case 596787200: return MediaType.ECMA_184_512;
case 654540800: return MediaType.ECMA_184;
case 1070617600: return MediaType.Jaz;
default: return MediaType.GENERIC_HDD;
}
#region Commodore
case 174848:
case 175531: return MediaType.CBM_1540;
case 196608:
case 197376: return MediaType.CBM_1540_Ext;
case 349696:
case 351062: return MediaType.CBM_1571;
#endregion Commodore
default: return MediaType.GENERIC_HDD;
}
}
#endregion

12
DiscImageChef/Commands/Analyze.cs
View File

@@ -94,13 +94,11 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Image format not identified, not proceeding with analysis.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
try
{

24
DiscImageChef/Commands/Compare.cs
View File

@@ -74,26 +74,22 @@ namespace DiscImageChef.Commands
DicConsole.ErrorWriteLine("Input file 1 format not identified, not proceeding with comparison.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name,
input1Format.PluginUuid);
else DicConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name,
input1Format.PluginUuid);
else DicConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name);
if(input2Format == null)
{
DicConsole.ErrorWriteLine("Input file 2 format not identified, not proceeding with comparison.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name,
input2Format.PluginUuid);
else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name,
input2Format.PluginUuid);
else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name);
input1Format.OpenImage(inputFilter1);
input2Format.OpenImage(inputFilter2);

12
DiscImageChef/Commands/CreateSidecar.cs
View File

@@ -97,13 +97,11 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Image format not identified, not proceeding with analysis.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
try
{

12
DiscImageChef/Commands/ExtractFiles.cs
View File

@@ -95,13 +95,11 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Image format not identified, not proceeding with analysis.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
if(Directory.Exists(options.OutputDir) || File.Exists(options.OutputDir))
{

12
DiscImageChef/Commands/Ls.cs
View File

@@ -91,13 +91,11 @@ namespace DiscImageChef.Commands
DicConsole.WriteLine("Image format not identified, not proceeding with analysis.");
return;
}
else
{
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
}
if(options.Verbose)
DicConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
imageFormat.PluginUuid);
else DicConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
try
{