From 9a404acef43454c2e1c816b7508a2f449304f610 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 21 Dec 2017 17:34:47 +0000 Subject: [PATCH] REFACTOR: Expression is always 'true' or always 'false'. --- DiscImageChef.Checksums/CDChecksums.cs | 3 +- .../Devices/Dumping/CompactDisc.cs | 29 ++-- .../Devices/Report/SCSI/General.cs | 4 +- DiscImageChef.Core/Devices/Report/SCSI/MMC.cs | 2 +- DiscImageChef.Decoders/SCSI/MMC/Features.cs | 152 ++++++------------ DiscImageChef.Decoders/SCSI/Modes/11.cs | 4 +- .../Device/ScsiCommands/Kreon.cs | 2 +- .../Device/ScsiCommands/Plextor.cs | 4 +- DiscImageChef.DiscImages/Alcohol120.cs | 2 +- DiscImageChef.DiscImages/VHD.cs | 2 +- DiscImageChef.Filesystems/LisaFS/Extent.cs | 1 + DiscImageChef.Filesystems/ZFS.cs | 2 +- DiscImageChef.Filesystems/dump.cs | 2 +- DiscImageChef.Filters/AppleDouble.cs | 32 ++-- DiscImageChef.Filters/AppleSingle.cs | 2 +- DiscImageChef.Filters/MacBinary.cs | 2 +- DiscImageChef.Partitions/RDB.cs | 2 +- DiscImageChef.Partitions/Sun.cs | 2 +- .../Controllers/UploadStatsController.cs | 16 +- 19 files changed, 104 insertions(+), 161 deletions(-) diff --git a/DiscImageChef.Checksums/CDChecksums.cs b/DiscImageChef.Checksums/CDChecksums.cs index 9a52e8ceb..b1ebacb4f 100644 --- a/DiscImageChef.Checksums/CDChecksums.cs +++ b/DiscImageChef.Checksums/CDChecksums.cs @@ -485,9 +485,8 @@ namespace DiscImageChef.Checksums DicConsole.DebugWriteLine("CD checksums", "CD-Text Pack 4 CRC 0x{0:X4}, expected 0x{1:X4}", cdTextPack4Crc, calculatedCdtp4Crc); - status = false; - return status; + return false; } static readonly ushort[] CcittCrc16Table = diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index 9d555afd0..5e84cd721 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -169,23 +169,22 @@ namespace DiscImageChef.Core.Devices.Dumping bool allFirstSessionTracksAreAudio = true; bool hasVideoTrack = false; - if(toc.HasValue) - foreach(FullTOC.TrackDataDescriptor track in toc.Value.TrackDescriptors) + foreach(FullTOC.TrackDataDescriptor track in toc.Value.TrackDescriptors) + { + if(track.TNO == 1 && ((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack || + (TOC_CONTROL)(track.CONTROL & 0x0D) == + TOC_CONTROL.DataTrackIncremental)) allFirstSessionTracksAreAudio &= firstTrackLastSession != 1; + + if((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack || + (TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrackIncremental) { - if(track.TNO == 1 && ((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack || - (TOC_CONTROL)(track.CONTROL & 0x0D) == - TOC_CONTROL.DataTrackIncremental)) allFirstSessionTracksAreAudio &= firstTrackLastSession != 1; - - if((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack || - (TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrackIncremental) - { - hasDataTrack = true; - allFirstSessionTracksAreAudio &= track.TNO >= firstTrackLastSession; - } - else hasAudioTrack = true; - - hasVideoTrack |= track.ADR == 4; + hasDataTrack = true; + allFirstSessionTracksAreAudio &= track.TNO >= firstTrackLastSession; } + else hasAudioTrack = true; + + hasVideoTrack |= track.ADR == 4; + } if(hasDataTrack && hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2) dskType = MediaType.CDPLUS; diff --git a/DiscImageChef.Core/Devices/Report/SCSI/General.cs b/DiscImageChef.Core/Devices/Report/SCSI/General.cs index 84bbf593a..adcf043ed 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/General.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/General.cs @@ -608,7 +608,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI if(pressedKey.Key == ConsoleKey.Y) { - for(ushort i = (ushort)mediaTest.BlockSize; i <= ushort.MaxValue; i++) + for(ushort i = (ushort)mediaTest.BlockSize; true; i++) { DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i); sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i, @@ -877,7 +877,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI if(pressedKey.Key == ConsoleKey.Y) { - for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize; i <= ushort.MaxValue; i++) + for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize; true; i++) { DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i); sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i, timeout, diff --git a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs index 2bdc4e130..d9d220316 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs @@ -1907,7 +1907,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI if(pressedKey.Key == ConsoleKey.Y) { - for(ushort i = (ushort)mediaTest.BlockSize; i <= ushort.MaxValue; i++) + for(ushort i = (ushort)mediaTest.BlockSize; true; i++) { DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i); sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i, timeout, diff --git a/DiscImageChef.Decoders/SCSI/MMC/Features.cs b/DiscImageChef.Decoders/SCSI/MMC/Features.cs index f4bebdd76..462e2c4d0 100644 --- a/DiscImageChef.Decoders/SCSI/MMC/Features.cs +++ b/DiscImageChef.Decoders/SCSI/MMC/Features.cs @@ -34,6 +34,8 @@ using System; using System.Collections.Generic; using System.Text; +// ReSharper disable MemberCanBePrivate.Global + namespace DiscImageChef.Decoders.SCSI.MMC { /// @@ -2212,9 +2214,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - decoded.PhysicalInterfaceStandard = - (PhysicalInterfaces)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); + decoded.PhysicalInterfaceStandard = + (PhysicalInterfaces)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); if(decoded.Version >= 1 && feature.Length >= 12) decoded.DBE |= (feature[8] & 0x01) == 0x01; @@ -2241,7 +2242,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.Async |= (feature[4] & 0x01) == 0x01; + decoded.Async |= (feature[4] & 0x01) == 0x01; if(decoded.Version >= 1) decoded.OCEvent |= (feature[4] & 0x02) == 0x02; @@ -2266,13 +2267,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.LoadingMechanismType = (byte)((feature[4] & 0xE0) >> 5); - decoded.Eject |= (feature[4] & 0x08) == 0x08; - decoded.PreventJumper |= (feature[4] & 0x04) == 0x04; - decoded.Lock |= (feature[4] & 0x01) == 0x01; - } + decoded.LoadingMechanismType = (byte)((feature[4] & 0xE0) >> 5); + decoded.Eject |= (feature[4] & 0x08) == 0x08; + decoded.PreventJumper |= (feature[4] & 0x04) == 0x04; + decoded.Lock |= (feature[4] & 0x01) == 0x01; if(decoded.Version < 2) return decoded; @@ -2300,11 +2298,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.SPWP |= (feature[4] & 0x02) == 0x02; - decoded.SSWPP |= (feature[4] & 0x01) == 0x01; - } + decoded.SPWP |= (feature[4] & 0x02) == 0x02; + decoded.SSWPP |= (feature[4] & 0x01) == 0x01; if(decoded.Version >= 1) decoded.WDCB |= (feature[4] & 0x04) == 0x04; @@ -2331,10 +2326,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - - decoded.LogicalBlockSize = - (uint)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); + decoded.LogicalBlockSize = (uint)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); decoded.Blocking = (ushort)((feature[8] << 8) + feature[9]); decoded.PP |= (feature[10] & 0x01) == 0x01; @@ -2578,10 +2570,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - - decoded.LogicalBlockSize = - (uint)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); + decoded.LogicalBlockSize = (uint)((feature[4] << 24) + (feature[5] << 16) + (feature[6] << 8) + feature[7]); decoded.Blocking = (ushort)((feature[8] << 8) + feature[9]); decoded.PP |= (feature[10] & 0x01) == 0x01; @@ -2648,7 +2637,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.Write |= (feature[4] & 0x01) == 0x01; + decoded.Write |= (feature[4] & 0x01) == 0x01; if(decoded.Version < 1) return decoded; @@ -2676,8 +2665,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.DRTDM |= (feature[4] & 0x01) == 0x01; decoded.DBICacheZones = feature[5]; decoded.Entries = (ushort)((feature[6] << 8) + feature[7]); @@ -2703,11 +2690,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.Write |= (feature[4] & 0x01) == 0x01; - decoded.CloseOnly |= (feature[5] & 0x01) == 0x01; - } + decoded.Write |= (feature[4] & 0x01) == 0x01; + decoded.CloseOnly |= (feature[5] & 0x01) == 0x01; if(decoded.Version >= 1) decoded.QuickStart |= (feature[5] & 0x02) == 0x02; @@ -2732,7 +2716,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.Write |= (feature[4] & 0x01) == 0x01; + decoded.Write |= (feature[4] & 0x01) == 0x01; return decoded; } @@ -2755,8 +2739,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.DSDG |= (feature[4] & 0x08) == 0x08; decoded.DSDR |= (feature[4] & 0x04) == 0x04; decoded.Intermediate |= (feature[4] & 0x02) == 0x02; @@ -2783,13 +2765,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.TestWrite |= (feature[4] & 0x04) == 0x04; - decoded.CDRW |= (feature[4] & 0x02) == 0x02; - decoded.RWSubchannel |= (feature[4] & 0x01) == 0x01; - decoded.DataTypeSupported = (ushort)((feature[6] << 8) + feature[7]); - } + decoded.TestWrite |= (feature[4] & 0x04) == 0x04; + decoded.CDRW |= (feature[4] & 0x02) == 0x02; + decoded.RWSubchannel |= (feature[4] & 0x01) == 0x01; + decoded.DataTypeSupported = (ushort)((feature[6] << 8) + feature[7]); if(decoded.Version < 2) return decoded; @@ -2818,16 +2797,13 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.SAO |= (feature[4] & 0x20) == 0x20; - decoded.RAWMS |= (feature[4] & 0x10) == 0x10; - decoded.RAW |= (feature[4] & 0x08) == 0x08; - decoded.TestWrite |= (feature[4] & 0x04) == 0x04; - decoded.CDRW |= (feature[4] & 0x02) == 0x02; - decoded.RW |= (feature[4] & 0x01) == 0x01; - decoded.MaxCueSheet = (uint)((feature[5] << 16) + (feature[6] << 8) + feature[7]); - } + decoded.SAO |= (feature[4] & 0x20) == 0x20; + decoded.RAWMS |= (feature[4] & 0x10) == 0x10; + decoded.RAW |= (feature[4] & 0x08) == 0x08; + decoded.TestWrite |= (feature[4] & 0x04) == 0x04; + decoded.CDRW |= (feature[4] & 0x02) == 0x02; + decoded.RW |= (feature[4] & 0x01) == 0x01; + decoded.MaxCueSheet = (uint)((feature[5] << 16) + (feature[6] << 8) + feature[7]); if(decoded.Version >= 1) decoded.BUF |= (feature[4] & 0x40) == 0x40; @@ -2852,11 +2828,8 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.BUF |= (feature[4] & 0x40) == 0x40; - decoded.TestWrite |= (feature[4] & 0x04) == 0x04; - } + decoded.BUF |= (feature[4] & 0x40) == 0x40; + decoded.TestWrite |= (feature[4] & 0x04) == 0x04; if(decoded.Version >= 1) decoded.DVDRW |= (feature[4] & 0x02) == 0x02; @@ -2904,7 +2877,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.TestWrite |= (feature[4] & 0x04) == 0x04; + decoded.TestWrite |= (feature[4] & 0x04) == 0x04; return decoded; } @@ -2927,8 +2900,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.Intermediate |= (feature[4] & 0x02) == 0x02; decoded.Blank |= (feature[4] & 0x01) == 0x01; @@ -3000,7 +2971,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.SubtypeSupport = feature[5]; + decoded.SubtypeSupport = feature[5]; return decoded; } @@ -3044,8 +3015,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.Write |= (feature[4] & 0x01) == 0x01; decoded.QuickStart |= (feature[5] & 0x02) == 0x02; decoded.CloseOnly |= (feature[5] & 0x01) == 0x01; @@ -3071,7 +3040,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.Write |= (feature[4] & 0x01) == 0x01; + decoded.Write |= (feature[4] & 0x01) == 0x01; return decoded; } @@ -3094,12 +3063,9 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.OldRE |= (feature[9] & 0x01) == 0x01; - decoded.OldR |= (feature[17] & 0x01) == 0x01; - decoded.OldROM |= (feature[25] & 0x01) == 0x01; - } + decoded.OldRE |= (feature[9] & 0x01) == 0x01; + decoded.OldR |= (feature[17] & 0x01) == 0x01; + decoded.OldROM |= (feature[25] & 0x01) == 0x01; if(decoded.Version < 1) return decoded; @@ -3130,12 +3096,9 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.SVNR |= (feature[4] & 0x01) == 0x01; - decoded.OldRE |= (feature[9] & 0x01) == 0x01; - decoded.OldR |= (feature[17] & 0x01) == 0x01; - } + decoded.SVNR |= (feature[4] & 0x01) == 0x01; + decoded.OldRE |= (feature[9] & 0x01) == 0x01; + decoded.OldR |= (feature[17] & 0x01) == 0x01; if(decoded.Version < 1) return decoded; @@ -3185,8 +3148,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.HDDVDR |= (feature[4] & 0x01) == 0x01; decoded.HDDVDRAM |= (feature[6] & 0x01) == 0x01; @@ -3211,8 +3172,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.HDDVDR |= (feature[4] & 0x01) == 0x01; decoded.HDDVDRAM |= (feature[6] & 0x01) == 0x01; @@ -3237,7 +3196,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.RI |= (feature[4] & 0x01) == 0x01; + decoded.RI |= (feature[4] & 0x01) == 0x01; return decoded; } @@ -3281,7 +3240,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.PP |= (feature[4] & 0x01) == 0x01; + decoded.PP |= (feature[4] & 0x01) == 0x01; return decoded; } @@ -3304,8 +3263,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.SCC |= (feature[4] & 0x10) == 0x10; decoded.SDP |= (feature[4] & 0x04) == 0x04; decoded.HighestSlotNumber = (byte)(feature[7] & 0x1F); @@ -3331,8 +3288,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.Scan |= (feature[4] & 0x04) == 0x04; decoded.SCM |= (feature[4] & 0x02) == 0x02; decoded.SV |= (feature[4] & 0x01) == 0x01; @@ -3408,7 +3363,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.CSSVersion = feature[7]; + decoded.CSSVersion = feature[7]; return decoded; } @@ -3466,8 +3421,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - byte[] serial = new byte[feature.Length]; Array.Copy(feature, 4, serial, 0, feature.Length - 4); decoded.Serial = StringHandlers.CToString(serial).Trim(); @@ -3514,8 +3467,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.DCBs = new uint[feature[3] / 4]; for(int i = 0; i < decoded.DCBs.Length; i++) decoded.DCBs[i] = (uint)((feature[0 + 4 + i * 4] << 24) + (feature[1 + 4 + i * 4] << 16) + @@ -3542,7 +3493,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.CPRMVersion = feature[7]; + decoded.CPRMVersion = feature[7]; return decoded; } @@ -3565,8 +3516,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.Century = (ushort)((feature[4] << 8) + feature[5]); decoded.Year = (ushort)((feature[6] << 8) + feature[7]); decoded.Month = (ushort)((feature[8] << 8) + feature[9]); @@ -3596,13 +3545,10 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) - { - decoded.BNG |= (feature[4] & 0x01) == 0x01; - decoded.BindNonceBlocks = feature[5]; - decoded.AGIDs = (byte)(feature[6] & 0x0F); - decoded.AACSVersion = feature[7]; - } + decoded.BNG |= (feature[4] & 0x01) == 0x01; + decoded.BindNonceBlocks = feature[5]; + decoded.AGIDs = (byte)(feature[6] & 0x0F); + decoded.AACSVersion = feature[7]; if(decoded.Version < 2) return decoded; @@ -3632,7 +3578,7 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version >= 0) decoded.MaxScrambleExtent = feature[4]; + decoded.MaxScrambleExtent = feature[4]; return decoded; } @@ -3697,8 +3643,6 @@ namespace DiscImageChef.Decoders.SCSI.MMC decoded.Persistent |= (feature[2] & 0x02) == 0x02; decoded.Version = (byte)((feature[2] & 0x3C) >> 2); - if(decoded.Version < 0) return decoded; - decoded.PSAU |= (feature[4] & 0x80) == 0x80; decoded.LOSPB |= (feature[4] & 0x40) == 0x40; decoded.ME |= (feature[4] & 0x01) == 0x01; diff --git a/DiscImageChef.Decoders/SCSI/Modes/11.cs b/DiscImageChef.Decoders/SCSI/Modes/11.cs index 41755f993..503ee8e11 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/11.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/11.cs @@ -192,9 +192,9 @@ namespace DiscImageChef.Decoders.SCSI sb.AppendLine("\tDevice may erase any or all partitions on MODE SELECT for partitioning"); else if(page.CLEAR && !page.ADDP) sb.AppendLine("\tDevice shall erase all partitions on MODE SELECT for partitioning"); - else if(!page.CLEAR && page.ADDP) + else if(!page.CLEAR) sb.AppendLine("\tDevice shall not erase any partition on MODE SELECT for partitioning"); - else if(page.CLEAR && page.ADDP) + else sb.AppendLine("\tDevice shall erase all partitions differing on size on MODE SELECT for partitioning"); string measure; diff --git a/DiscImageChef.Devices/Device/ScsiCommands/Kreon.cs b/DiscImageChef.Devices/Device/ScsiCommands/Kreon.cs index d4d5dc7ff..630d455e2 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands/Kreon.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands/Kreon.cs @@ -159,7 +159,7 @@ namespace DiscImageChef.Devices DicConsole.DebugWriteLine("SCSI Device", "KREON GET FEATURE LIST took {0} ms.", duration); - if(sense) return sense; + if(sense) return true; if(buffer[0] != 0xA5 || buffer[1] != 0x5A || buffer[2] != 0x5A || buffer[3] != 0xA5) return true; diff --git a/DiscImageChef.Devices/Device/ScsiCommands/Plextor.cs b/DiscImageChef.Devices/Device/ScsiCommands/Plextor.cs index a438482ec..59a1c86ae 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands/Plextor.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands/Plextor.cs @@ -240,7 +240,7 @@ namespace DiscImageChef.Devices max = BigEndianBitConverter.ToUInt16(buf, 6); last = BigEndianBitConverter.ToUInt16(buf, 8); - return sense; + return false; } /// @@ -279,7 +279,7 @@ namespace DiscImageChef.Devices enabled = buf[2] != 0; speed = BigEndianBitConverter.ToUInt16(buf, 4); - return sense; + return false; } /// diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs index b6e67d4ef..24ab3b4af 100644 --- a/DiscImageChef.DiscImages/Alcohol120.cs +++ b/DiscImageChef.DiscImages/Alcohol120.cs @@ -448,7 +448,7 @@ namespace DiscImageChef.DiscImages if(isDvd) { // TODO: Second layer - if(header.structuresOffset >= 0) + if(header.structuresOffset > 0) { byte[] structures = new byte[4100]; stream.Seek(header.structuresOffset, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/VHD.cs b/DiscImageChef.DiscImages/VHD.cs index 9334a7e92..c047baf5b 100644 --- a/DiscImageChef.DiscImages/VHD.cs +++ b/DiscImageChef.DiscImages/VHD.cs @@ -919,7 +919,7 @@ namespace DiscImageChef.DiscImages currentLocator++; } - if(!locatorFound || parentPath == null) + if(!locatorFound) throw new FileNotFoundException("(VirtualPC plugin): Cannot find parent file for differencing disk image"); diff --git a/DiscImageChef.Filesystems/LisaFS/Extent.cs b/DiscImageChef.Filesystems/LisaFS/Extent.cs index c798f92b1..db441acb6 100644 --- a/DiscImageChef.Filesystems/LisaFS/Extent.cs +++ b/DiscImageChef.Filesystems/LisaFS/Extent.cs @@ -88,6 +88,7 @@ namespace DiscImageChef.Filesystems.LisaFS if(extTag.fileID != fileId * -1) continue; ptr = i; + found = true; break; } diff --git a/DiscImageChef.Filesystems/ZFS.cs b/DiscImageChef.Filesystems/ZFS.cs index f2ffd2170..284ac91ec 100644 --- a/DiscImageChef.Filesystems/ZFS.cs +++ b/DiscImageChef.Filesystems/ZFS.cs @@ -645,7 +645,7 @@ namespace DiscImageChef.Filesystems byte[] subListBytes = new byte[item.encodedSize - (offset - currOff)]; Array.Copy(nvlist, offset, subListBytes, 0, subListBytes.Length); Dictionary subList; - if(DecodeNvList(subListBytes, out subList, xdr, littleEndian)) item.value = subList; + if(DecodeNvList(subListBytes, out subList, true, littleEndian)) item.value = subList; else goto default; offset = (int)(currOff + item.encodedSize); break; diff --git a/DiscImageChef.Filesystems/dump.cs b/DiscImageChef.Filesystems/dump.cs index 95b8f63fa..d406acac3 100644 --- a/DiscImageChef.Filesystems/dump.cs +++ b/DiscImageChef.Filesystems/dump.cs @@ -378,7 +378,7 @@ namespace DiscImageChef.Filesystems } sb.AppendFormat("Dump volume number: {0}", aixHdr.c_volume).AppendLine(); } - else if(useNew) + else { xmlFSType.Type = "dump(8)"; sb.AppendLine(xmlFSType.Type); diff --git a/DiscImageChef.Filters/AppleDouble.cs b/DiscImageChef.Filters/AppleDouble.cs index 51c2a3023..705eb3c13 100644 --- a/DiscImageChef.Filters/AppleDouble.cs +++ b/DiscImageChef.Filters/AppleDouble.cs @@ -269,7 +269,7 @@ namespace DiscImageChef.Filters if(File.Exists(ProDosAppleDouble)) { FileStream prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read); - if(prodosStream != null && prodosStream.Length > 26) + if(prodosStream.Length > 26) { byte[] prodos_b = new byte[26]; prodosStream.Read(prodos_b, 0, 26); @@ -284,7 +284,7 @@ namespace DiscImageChef.Filters if(File.Exists(UNIXAppleDouble)) { FileStream unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read); - if(unixStream != null && unixStream.Length > 26) + if(unixStream.Length > 26) { byte[] unix_b = new byte[26]; unixStream.Read(unix_b, 0, 26); @@ -299,7 +299,7 @@ namespace DiscImageChef.Filters if(File.Exists(DOSAppleDouble)) { FileStream dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read); - if(dosStream != null && dosStream.Length > 26) + if(dosStream.Length > 26) { byte[] dos_b = new byte[26]; dosStream.Read(dos_b, 0, 26); @@ -314,7 +314,7 @@ namespace DiscImageChef.Filters if(File.Exists(DOSAppleDoubleLower)) { FileStream doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read); - if(doslStream != null && doslStream.Length > 26) + if(doslStream.Length > 26) { byte[] dosl_b = new byte[26]; doslStream.Read(dosl_b, 0, 26); @@ -329,7 +329,7 @@ namespace DiscImageChef.Filters if(File.Exists(NetatalkAppleDouble)) { FileStream netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read); - if(netatalkStream != null && netatalkStream.Length > 26) + if(netatalkStream.Length > 26) { byte[] netatalk_b = new byte[26]; netatalkStream.Read(netatalk_b, 0, 26); @@ -344,7 +344,7 @@ namespace DiscImageChef.Filters if(File.Exists(DAVEAppleDouble)) { FileStream daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read); - if(daveStream != null && daveStream.Length > 26) + if(daveStream.Length > 26) { byte[] dave_b = new byte[26]; daveStream.Read(dave_b, 0, 26); @@ -359,7 +359,7 @@ namespace DiscImageChef.Filters if(File.Exists(OSXAppleDouble)) { FileStream osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read); - if(osxStream != null && osxStream.Length > 26) + if(osxStream.Length > 26) { byte[] osx_b = new byte[26]; osxStream.Read(osx_b, 0, 26); @@ -374,7 +374,7 @@ namespace DiscImageChef.Filters if(!File.Exists(UnArAppleDouble)) return false; FileStream unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read); - if(unarStream == null || unarStream.Length <= 26) return false; + if(unarStream.Length <= 26) return false; byte[] unar_b = new byte[26]; unarStream.Read(unar_b, 0, 26); @@ -439,7 +439,7 @@ namespace DiscImageChef.Filters if(File.Exists(ProDosAppleDouble)) { FileStream prodosStream = new FileStream(ProDosAppleDouble, FileMode.Open, FileAccess.Read); - if(prodosStream != null && prodosStream.Length > 26) + if(prodosStream.Length > 26) { byte[] prodos_b = new byte[26]; prodosStream.Read(prodos_b, 0, 26); @@ -455,7 +455,7 @@ namespace DiscImageChef.Filters if(File.Exists(UNIXAppleDouble)) { FileStream unixStream = new FileStream(UNIXAppleDouble, FileMode.Open, FileAccess.Read); - if(unixStream != null && unixStream.Length > 26) + if(unixStream.Length > 26) { byte[] unix_b = new byte[26]; unixStream.Read(unix_b, 0, 26); @@ -471,7 +471,7 @@ namespace DiscImageChef.Filters if(File.Exists(DOSAppleDouble)) { FileStream dosStream = new FileStream(DOSAppleDouble, FileMode.Open, FileAccess.Read); - if(dosStream != null && dosStream.Length > 26) + if(dosStream.Length > 26) { byte[] dos_b = new byte[26]; dosStream.Read(dos_b, 0, 26); @@ -487,7 +487,7 @@ namespace DiscImageChef.Filters if(File.Exists(DOSAppleDoubleLower)) { FileStream doslStream = new FileStream(DOSAppleDoubleLower, FileMode.Open, FileAccess.Read); - if(doslStream != null && doslStream.Length > 26) + if(doslStream.Length > 26) { byte[] dosl_b = new byte[26]; doslStream.Read(dosl_b, 0, 26); @@ -503,7 +503,7 @@ namespace DiscImageChef.Filters if(File.Exists(NetatalkAppleDouble)) { FileStream netatalkStream = new FileStream(NetatalkAppleDouble, FileMode.Open, FileAccess.Read); - if(netatalkStream != null && netatalkStream.Length > 26) + if(netatalkStream.Length > 26) { byte[] netatalk_b = new byte[26]; netatalkStream.Read(netatalk_b, 0, 26); @@ -519,7 +519,7 @@ namespace DiscImageChef.Filters if(File.Exists(DAVEAppleDouble)) { FileStream daveStream = new FileStream(DAVEAppleDouble, FileMode.Open, FileAccess.Read); - if(daveStream != null && daveStream.Length > 26) + if(daveStream.Length > 26) { byte[] dave_b = new byte[26]; daveStream.Read(dave_b, 0, 26); @@ -535,7 +535,7 @@ namespace DiscImageChef.Filters if(File.Exists(OSXAppleDouble)) { FileStream osxStream = new FileStream(OSXAppleDouble, FileMode.Open, FileAccess.Read); - if(osxStream != null && osxStream.Length > 26) + if(osxStream.Length > 26) { byte[] osx_b = new byte[26]; osxStream.Read(osx_b, 0, 26); @@ -551,7 +551,7 @@ namespace DiscImageChef.Filters if(File.Exists(UnArAppleDouble)) { FileStream unarStream = new FileStream(UnArAppleDouble, FileMode.Open, FileAccess.Read); - if(unarStream != null && unarStream.Length > 26) + if(unarStream.Length > 26) { byte[] unar_b = new byte[26]; unarStream.Read(unar_b, 0, 26); diff --git a/DiscImageChef.Filters/AppleSingle.cs b/DiscImageChef.Filters/AppleSingle.cs index e2969aeaa..947730f02 100644 --- a/DiscImageChef.Filters/AppleSingle.cs +++ b/DiscImageChef.Filters/AppleSingle.cs @@ -268,7 +268,7 @@ namespace DiscImageChef.Filters public override bool Identify(string path) { FileStream fstream = new FileStream(path, FileMode.Open, FileAccess.Read); - if(fstream == null || fstream.Length < 26) return false; + if(fstream.Length < 26) return false; byte[] hdr_b = new byte[26]; fstream.Read(hdr_b, 0, 26); diff --git a/DiscImageChef.Filters/MacBinary.cs b/DiscImageChef.Filters/MacBinary.cs index 4cd080581..a41b0914e 100644 --- a/DiscImageChef.Filters/MacBinary.cs +++ b/DiscImageChef.Filters/MacBinary.cs @@ -298,7 +298,7 @@ namespace DiscImageChef.Filters public override bool Identify(string path) { FileStream fstream = new FileStream(path, FileMode.Open, FileAccess.Read); - if(fstream == null || fstream.Length < 128) return false; + if(fstream.Length < 128) return false; byte[] hdr_b = new byte[128]; fstream.Read(hdr_b, 0, 128); diff --git a/DiscImageChef.Partitions/RDB.cs b/DiscImageChef.Partitions/RDB.cs index 1aa2ad399..a6fcec9fb 100644 --- a/DiscImageChef.Partitions/RDB.cs +++ b/DiscImageChef.Partitions/RDB.cs @@ -901,7 +901,7 @@ namespace DiscImageChef.Partitions ulong rdbBlock = 0; bool foundRdb = false; - while(rdbBlock < 16 && !foundRdb) + while(rdbBlock < 16) { if(imagePlugin.GetSectors() <= rdbBlock) return false; diff --git a/DiscImageChef.Partitions/Sun.cs b/DiscImageChef.Partitions/Sun.cs index 47c344892..899b91315 100644 --- a/DiscImageChef.Partitions/Sun.cs +++ b/DiscImageChef.Partitions/Sun.cs @@ -280,7 +280,7 @@ namespace DiscImageChef.Partitions partitions.Add(part); } } - else if(useDkl16) + else { DicConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity); DicConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version); diff --git a/DiscImageChef.Server/Controllers/UploadStatsController.cs b/DiscImageChef.Server/Controllers/UploadStatsController.cs index 166986266..765ca4694 100644 --- a/DiscImageChef.Server/Controllers/UploadStatsController.cs +++ b/DiscImageChef.Server/Controllers/UploadStatsController.cs @@ -127,7 +127,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.OperatingSystems.Remove(removeNvs); oldStats.OperatingSystems.Add(addNvs); @@ -155,7 +155,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.OperatingSystems.Remove(removeNvs); oldStats.OperatingSystems.Add(addNvs); @@ -182,7 +182,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.Versions.Remove(removeNvs); oldStats.Versions.Add(addNvs); @@ -208,7 +208,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.Versions.Remove(removeNvs); oldStats.Versions.Add(addNvs); @@ -235,7 +235,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.Filesystems.Remove(removeNvs); oldStats.Filesystems.Add(addNvs); @@ -261,7 +261,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.Partitions.Remove(removeNvs); oldStats.Partitions.Add(addNvs); @@ -287,7 +287,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.MediaImages.Remove(removeNvs); oldStats.MediaImages.Add(addNvs); @@ -313,7 +313,7 @@ namespace DiscImageChef.Server.Controllers break; } - if(removeNvs != null && addNvs != null) + if(removeNvs != null) { oldStats.Filters.Remove(removeNvs); oldStats.Filters.Add(addNvs);