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

10
DiscImageChef.Checksums/CDChecksums.cs
View File

@@ -142,7 +142,8 @@ namespace DiscImageChef.Checksums
return true; 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}", DicConsole.DebugWriteLine("CD checksums", "Mode 1 sector at address {0:X2}:{1:X2}:{2:X2}",
channel[0x00C], channel[0x00D], channel[0x00E]); channel[0x00C], channel[0x00D], channel[0x00E]);
@@ -200,7 +201,8 @@ namespace DiscImageChef.Checksums
return true; 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}", DicConsole.DebugWriteLine("CD checksums", "Mode 2 sector at address {0:X2}:{1:X2}:{2:X2}",
channel[0x00C], channel[0x00D], channel[0x00E]); channel[0x00C], channel[0x00D], channel[0x00E]);
@@ -281,14 +283,12 @@ namespace DiscImageChef.Checksums
return true; return true;
} }
else
{
DicConsole.DebugWriteLine("CD checksums", DicConsole.DebugWriteLine("CD checksums",
"Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}", "Unknown mode {0} sector at address: {1:X2}:{2:X2}:{3:X2}",
channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]); channel[0x00F], channel[0x00C], channel[0x00D], channel[0x00E]);
return null; return null;
} }
}
return null; return null;
} }

2
DiscImageChef.CommonTypes/Partition.cs
View File

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

3
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"); if(dumpRaw) throw new NotImplementedException("Raw CD dumping not yet implemented");
else
{
// TODO: Check subchannel capabilities // TODO: Check subchannel capabilities
readcd = !dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 1, MmcSectorTypes.AllTypes, false, readcd = !dev.ReadCd(out readBuffer, out senseBuf, 0, blockSize, 1, MmcSectorTypes.AllTypes, false,
false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
MmcSubchannel.Raw, dev.Timeout, out duration); 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; DumpHardwareType currentTry = null;
ExtentsULong extents = null; ExtentsULong extents = null;

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

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

4
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -727,8 +727,7 @@ namespace DiscImageChef.DiscImages
throw new throw new
FeatureUnsupportedImageException(string.Format("Found INDEX before a track {0}", FeatureUnsupportedImageException(string.Format("Found INDEX before a track {0}",
line)); line));
else
{
int index = int.Parse(matchIndex.Groups[1].Value); int index = int.Parse(matchIndex.Groups[1].Value);
ulong offset = CdrWinMsftoLba(matchIndex.Groups[2].Value); ulong offset = CdrWinMsftoLba(matchIndex.Groups[2].Value);
@@ -768,7 +767,6 @@ namespace DiscImageChef.DiscImages
currentfileoffsetsector = offset; currentfileoffsetsector = offset;
currenttrack.Indexes.Add(index, offset); currenttrack.Indexes.Add(index, offset);
} }
}
else if(matchIsrc.Success) else if(matchIsrc.Success)
{ {
DicConsole.DebugWriteLine("CDRWin plugin", "Found ISRC at line {0}", line); DicConsole.DebugWriteLine("CDRWin plugin", "Found ISRC at line {0}", line);

6
DiscImageChef.DiscImages/TeleDisk.cs
View File

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

2
DiscImageChef.DiscImages/VHD.cs
View File

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

6
DiscImageChef.DiscImages/ZZZRawImage.cs
View File

@@ -672,8 +672,7 @@ namespace DiscImageChef.DiscImages
public override byte[] ReadSectors(ulong sectorAddress, uint length) public override byte[] ReadSectors(ulong sectorAddress, uint length)
{ {
if(differentTrackZeroSize) throw new NotImplementedException("Not yet implemented"); if(differentTrackZeroSize) throw new NotImplementedException("Not yet implemented");
else
{
if(sectorAddress > ImageInfo.Sectors - 1) if(sectorAddress > ImageInfo.Sectors - 1)
throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found"); throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found");
@@ -690,7 +689,6 @@ namespace DiscImageChef.DiscImages
return buffer; return buffer;
} }
}
public override string GetImageFormat() public override string GetImageFormat()
{ {
@@ -915,7 +913,7 @@ namespace DiscImageChef.DiscImages
return MediaType.Unknown; return MediaType.Unknown;
} }
else
switch(ImageInfo.ImageSize) switch(ImageInfo.ImageSize)
{ {
case 80384: return MediaType.ECMA_66; case 80384: return MediaType.ECMA_66;

4
DiscImageChef/Commands/Analyze.cs
View File

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

8
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."); DicConsole.ErrorWriteLine("Input file 1 format not identified, not proceeding with comparison.");
return; return;
} }
else
{
if(options.Verbose) if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name, DicConsole.VerboseWriteLine("Input file 1 format identified by {0} ({1}).", input1Format.Name,
input1Format.PluginUuid); input1Format.PluginUuid);
else DicConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name); else DicConsole.WriteLine("Input file 1 format identified by {0}.", input1Format.Name);
}
if(input2Format == null) if(input2Format == null)
{ {
DicConsole.ErrorWriteLine("Input file 2 format not identified, not proceeding with comparison."); DicConsole.ErrorWriteLine("Input file 2 format not identified, not proceeding with comparison.");
return; return;
} }
else
{
if(options.Verbose) if(options.Verbose)
DicConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name, DicConsole.VerboseWriteLine("Input file 2 format identified by {0} ({1}).", input2Format.Name,
input2Format.PluginUuid); input2Format.PluginUuid);
else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name); else DicConsole.WriteLine("Input file 2 format identified by {0}.", input2Format.Name);
}
input1Format.OpenImage(inputFilter1); input1Format.OpenImage(inputFilter1);
input2Format.OpenImage(inputFilter2); input2Format.OpenImage(inputFilter2);

4
DiscImageChef/Commands/CreateSidecar.cs
View File

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

4
DiscImageChef/Commands/ExtractFiles.cs
View File

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

4
DiscImageChef/Commands/Ls.cs
View File

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