From bcbda18e4d67eac3acbc3d90bc6b37df369fca55 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 21 Dec 2017 16:07:20 +0000 Subject: [PATCH] REFACTOR: Removed unneeded value sets. --- DiscImageChef.Checksums/CDChecksums.cs | 3 --- .../Devices/Dumping/CompactDisc.cs | 18 +++++++-------- DiscImageChef.Core/Devices/Dumping/MMC.cs | 8 +++---- DiscImageChef.Core/Devices/Dumping/SBC.cs | 22 +++++++++---------- DiscImageChef.Core/Devices/Dumping/SCSI.cs | 4 ++-- DiscImageChef.Core/Devices/Dumping/SSC.cs | 9 ++++---- .../Devices/Dumping/SecureDigital.cs | 2 +- DiscImageChef.Core/Devices/Dumping/XGD.cs | 14 +++++------- DiscImageChef.Core/Devices/ReaderSCSI.cs | 10 ++++----- DiscImageChef.Core/Devices/Report/ATA.cs | 8 +++---- DiscImageChef.Core/Devices/Report/SCSI/MMC.cs | 2 +- DiscImageChef.Core/Devices/Report/SCSI/SSC.cs | 4 ++-- DiscImageChef.Core/Devices/Scanning/ATA.cs | 12 +++++----- DiscImageChef.Core/Statistics.cs | 2 +- DiscImageChef.Decoders/ATA/Identify.cs | 13 ++--------- DiscImageChef.Decoders/CD/ATIP.cs | 2 +- DiscImageChef.Decoders/Floppy/Apple2.cs | 2 +- DiscImageChef.Decoders/Floppy/AppleSony.cs | 2 +- DiscImageChef.Decoders/LisaTag.cs | 2 +- DiscImageChef.Decoders/MMC/CID.cs | 3 +-- DiscImageChef.Decoders/MMC/CSD.cs | 5 +++-- DiscImageChef.Decoders/MMC/ExtendedCSD.cs | 2 +- DiscImageChef.Decoders/PCMCIA/CIS.cs | 1 + DiscImageChef.Decoders/SCSI/EVPD.cs | 2 +- DiscImageChef.Decoders/SCSI/Modes/11.cs | 2 +- DiscImageChef.Decoders/SCSI/Modes/Headers.cs | 2 +- DiscImageChef.Decoders/SecureDigital/CID.cs | 2 +- DiscImageChef.Decoders/SecureDigital/CSD.cs | 4 ++-- DiscImageChef.Decoders/SecureDigital/SCR.cs | 2 +- DiscImageChef.Decoders/Sega/CD.cs | 2 +- DiscImageChef.Decoders/Sega/Dreamcast.cs | 2 +- DiscImageChef.Decoders/Sega/Saturn.cs | 2 +- DiscImageChef.Devices/Device/Constructor.cs | 8 ++----- .../Device/MmcCommands/MMC.cs | 12 +++++----- .../Device/ScsiCommands/Fujitsu.cs | 14 ------------ DiscImageChef.Devices/Linux/ListDevices.cs | 2 +- DiscImageChef.Devices/Windows/UsbFunctions.cs | 2 +- DiscImageChef.DiscImages/Alcohol120.cs | 11 +++++----- DiscImageChef.DiscImages/Apridisk.cs | 6 ++--- DiscImageChef.DiscImages/BlindWrite4.cs | 2 +- DiscImageChef.DiscImages/CDRDAO.cs | 5 ++--- DiscImageChef.DiscImages/CDRWin.cs | 3 --- DiscImageChef.DiscImages/CHD.cs | 14 +++++------- DiscImageChef.DiscImages/CPCDSK.cs | 6 ++--- DiscImageChef.DiscImages/CisCopy.cs | 4 ++-- DiscImageChef.DiscImages/DiscJuggler.cs | 1 - DiscImageChef.DiscImages/DriDiskCopy.cs | 2 +- DiscImageChef.DiscImages/KryoFlux.cs | 1 - DiscImageChef.DiscImages/MaxiDisk.cs | 4 ++-- DiscImageChef.DiscImages/NDIF.cs | 1 - DiscImageChef.DiscImages/QCOW.cs | 4 ++-- DiscImageChef.DiscImages/QCOW2.cs | 4 ++-- DiscImageChef.DiscImages/RayDIM.cs | 4 ++-- DiscImageChef.DiscImages/SaveDskF.cs | 2 +- DiscImageChef.DiscImages/TeleDisk.cs | 3 +-- DiscImageChef.DiscImages/UDIF.cs | 1 - DiscImageChef.DiscImages/VHD.cs | 2 +- DiscImageChef.DiscImages/VHDX.cs | 1 - DiscImageChef.DiscImages/VMware.cs | 2 +- DiscImageChef.Filesystems/AppleDOS/Dir.cs | 2 +- DiscImageChef.Filesystems/AppleDOS/File.cs | 2 +- DiscImageChef.Filesystems/AppleDOS/Info.cs | 4 ++-- DiscImageChef.Filesystems/AppleHFS.cs | 4 ++-- DiscImageChef.Filesystems/AtheOS.cs | 2 +- DiscImageChef.Filesystems/BFS.cs | 2 +- DiscImageChef.Filesystems/CPM/Dir.cs | 2 +- DiscImageChef.Filesystems/CPM/Info.cs | 4 ++-- DiscImageChef.Filesystems/CPM/Super.cs | 10 ++++----- DiscImageChef.Filesystems/FAT.cs | 3 --- DiscImageChef.Filesystems/FATX.cs | 4 ++-- DiscImageChef.Filesystems/Fossil.cs | 4 ++-- DiscImageChef.Filesystems/HAMMER.cs | 2 +- DiscImageChef.Filesystems/HPFS.cs | 9 +++----- DiscImageChef.Filesystems/ISO9660/Info.cs | 16 +++++--------- DiscImageChef.Filesystems/LIF.cs | 4 ++-- DiscImageChef.Filesystems/LisaFS/Dir.cs | 3 ++- DiscImageChef.Filesystems/MicroDOS.cs | 4 ++-- DiscImageChef.Filesystems/MinixFS.cs | 6 ++--- DiscImageChef.Filesystems/NTFS.cs | 22 +++++++++---------- DiscImageChef.Filesystems/Nintendo.cs | 7 +++--- DiscImageChef.Filesystems/ODS.cs | 3 +-- DiscImageChef.Filesystems/PFS.cs | 2 +- DiscImageChef.Filesystems/QNX4.cs | 4 ++-- DiscImageChef.Filesystems/RT11.cs | 2 +- DiscImageChef.Filesystems/SFS.cs | 2 +- DiscImageChef.Filesystems/SysV.cs | 5 ++--- DiscImageChef.Filesystems/ZFS.cs | 2 +- DiscImageChef.Filesystems/exFAT.cs | 8 +++---- DiscImageChef.Filesystems/ext2FS.cs | 4 ---- DiscImageChef.Partitions/Acorn.cs | 6 ++--- DiscImageChef.Partitions/Apricot.cs | 2 +- DiscImageChef.Partitions/DEC.cs | 2 +- DiscImageChef.Partitions/DragonFlyBSD.cs | 2 +- DiscImageChef.Partitions/Human68k.cs | 2 +- DiscImageChef.Partitions/PC98.cs | 2 +- DiscImageChef.Partitions/RioKarma.cs | 2 +- DiscImageChef.Partitions/UNIX.cs | 2 +- DiscImageChef.Partitions/VTOC.cs | 2 -- DiscImageChef.Partitions/Xbox.cs | 2 +- DiscImageChef.Server/Statistics.aspx.cs | 2 +- DiscImageChef.Server/ViewReport.aspx.cs | 6 ++--- DiscImageChef.Tests.Devices/ATA/Smart.cs | 2 -- DiscImageChef/Commands/Analyze.cs | 1 - DiscImageChef/Commands/Configure.cs | 1 - DiscImageChef/Commands/CreateSidecar.cs | 1 - DiscImageChef/Commands/Decode.cs | 2 ++ DiscImageChef/Commands/DumpMedia.cs | 1 - DiscImageChef/Commands/ExtractFiles.cs | 1 - DiscImageChef/Commands/Ls.cs | 1 - DiscImageChef/Commands/MediaScan.cs | 2 +- 110 files changed, 203 insertions(+), 280 deletions(-) diff --git a/DiscImageChef.Checksums/CDChecksums.cs b/DiscImageChef.Checksums/CDChecksums.cs index 6f959a97..9a52e8ce 100644 --- a/DiscImageChef.Checksums/CDChecksums.cs +++ b/DiscImageChef.Checksums/CDChecksums.cs @@ -59,7 +59,6 @@ namespace DiscImageChef.Checksums bool? subchannelStatus = CheckCdSectorSubChannel(subchannel); bool? status = null; - if(channelStatus == null && subchannelStatus == null) status = null; if(channelStatus == false || subchannelStatus == false) status = false; switch(channelStatus) { case null when subchannelStatus == true: status = true; @@ -68,8 +67,6 @@ namespace DiscImageChef.Checksums break; } - if(channelStatus == true && subchannelStatus == true) status = true; - return status; } case 2352: return CheckCdSectorChannel(buffer); diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index 9cc0cc59..663b9bba 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -62,10 +62,10 @@ namespace DiscImageChef.Core.Devices.Dumping MhddLog mhddLog; IbgLog ibgLog; bool sense = false; - ulong blocks = 0; + ulong blocks; // TODO: Check subchannel support - uint blockSize = 0; - uint subSize = 0; + uint blockSize; + uint subSize; byte[] tmpBuf; FullTOC.CDFullTOC? toc = null; DateTime start; @@ -76,11 +76,11 @@ namespace DiscImageChef.Core.Devices.Dumping double maxSpeed = double.MinValue; double minSpeed = double.MaxValue; Checksum dataChk; - bool readcd = false; + bool readcd; byte[] readBuffer; uint blocksToRead = 64; ulong errored = 0; - DataFile dumpFile = null; + DataFile dumpFile; bool aborted = false; System.Console.CancelKeyPress += (sender, e) => { e.Cancel = aborted = true; }; @@ -387,8 +387,6 @@ namespace DiscImageChef.Core.Devices.Dumping dumpFile = new DataFile(outputPrefix + ".leadin.bin"); dataChk = new Checksum(); - start = DateTime.UtcNow; - readBuffer = null; dumpLog.WriteLine("Reading Lead-in"); @@ -700,7 +698,7 @@ namespace DiscImageChef.Core.Devices.Dumping break; } - double cmdDuration = 0; + double cmdDuration; DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, forward ? "forward" : "reverse", @@ -742,8 +740,8 @@ namespace DiscImageChef.Core.Devices.Dumping Modes.DecodedMode? currentMode = null; Modes.ModePage? currentModePage = null; - byte[] md6 = null; - byte[] md10 = null; + byte[] md6; + byte[] md10; if(!runningPersistent && persistent) { diff --git a/DiscImageChef.Core/Devices/Dumping/MMC.cs b/DiscImageChef.Core/Devices/Dumping/MMC.cs index b0105b03..5e697597 100644 --- a/DiscImageChef.Core/Devices/Dumping/MMC.cs +++ b/DiscImageChef.Core/Devices/Dumping/MMC.cs @@ -55,14 +55,13 @@ namespace DiscImageChef.Core.Devices.Dumping ref MediaType dskType, bool separateSubchannel, ref Resume resume, ref DumpLog dumpLog, bool dumpLeadIn, Encoding encoding) { - byte[] cmdBuf = null; - byte[] senseBuf = null; - bool sense = false; + byte[] cmdBuf; + byte[] senseBuf; + bool sense; double duration; ulong blocks = 0; byte[] tmpBuf; bool compactDisc = true; - ushort currentProfile = 0x0001; bool isXbox = false; Alcohol120 alcohol = new Alcohol120(outputPrefix); @@ -76,7 +75,6 @@ namespace DiscImageChef.Core.Devices.Dumping if(!sense) { Features.SeparatedFeatures ftr = Features.Separate(cmdBuf); - currentProfile = ftr.CurrentProfile; dumpLog.WriteLine("Device reports current profile is 0x{0:X4}", ftr.CurrentProfile); switch(ftr.CurrentProfile) diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs index 5276b1fe..c1f62323 100644 --- a/DiscImageChef.Core/Devices/Dumping/SBC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs @@ -62,14 +62,14 @@ namespace DiscImageChef.Core.Devices.Dumping { MhddLog mhddLog; IbgLog ibgLog; - byte[] cmdBuf = null; - byte[] senseBuf = null; - bool sense = false; + byte[] cmdBuf; + byte[] senseBuf; + bool sense; double duration; - ulong blocks = 0; - uint blockSize = 0; - uint logicalBlockSize = 0; - uint physicalBlockSize = 0; + ulong blocks; + uint blockSize; + uint logicalBlockSize; + uint physicalBlockSize; byte scsiMediumType = 0; byte scsiDensityCode = 0; bool containsFloppyPage = false; @@ -85,7 +85,7 @@ namespace DiscImageChef.Core.Devices.Dumping byte[] readBuffer; uint blocksToRead = 64; ulong errored = 0; - DataFile dumpFile = null; + DataFile dumpFile; bool aborted = false; System.Console.CancelKeyPress += (sender, e) => { e.Cancel = aborted = true; }; @@ -331,8 +331,6 @@ namespace DiscImageChef.Core.Devices.Dumping start = DateTime.UtcNow; - readBuffer = null; - if(alcohol != null && !dumpRaw) { alcohol.AddSessions(new[] {new Session {StartTrack = 1, EndTrack = 1, SessionSequence = 1}}); @@ -461,8 +459,8 @@ namespace DiscImageChef.Core.Devices.Dumping Modes.DecodedMode? currentMode = null; Modes.ModePage? currentModePage = null; - byte[] md6 = null; - byte[] md10 = null; + byte[] md6; + byte[] md10; if(!runningPersistent && persistent) { diff --git a/DiscImageChef.Core/Devices/Dumping/SCSI.cs b/DiscImageChef.Core/Devices/Dumping/SCSI.cs index dabf2eba..1ef36b70 100644 --- a/DiscImageChef.Core/Devices/Dumping/SCSI.cs +++ b/DiscImageChef.Core/Devices/Dumping/SCSI.cs @@ -50,8 +50,8 @@ namespace DiscImageChef.Core.Devices.Dumping bool dumpRaw, bool persistent, bool stopOnError, bool separateSubchannel, ref Resume resume, ref DumpLog dumpLog, bool dumpLeadIn, Encoding encoding) { - byte[] senseBuf = null; - bool sense = false; + byte[] senseBuf; + bool sense; MediaType dskType = MediaType.Unknown; int resets = 0; diff --git a/DiscImageChef.Core/Devices/Dumping/SSC.cs b/DiscImageChef.Core/Devices/Dumping/SSC.cs index 2dcbd1ba..f3c73bc8 100644 --- a/DiscImageChef.Core/Devices/Dumping/SSC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SSC.cs @@ -55,9 +55,9 @@ namespace DiscImageChef.Core.Devices.Dumping bool aborted; MhddLog mhddLog; IbgLog ibgLog; - bool sense = false; + bool sense; ulong blocks = 0; - uint blockSize = 0; + uint blockSize; MediaType dskType = MediaType.Unknown; DateTime start; DateTime end; @@ -66,7 +66,6 @@ namespace DiscImageChef.Core.Devices.Dumping double currentSpeed = 0; double maxSpeed = double.MinValue; double minSpeed = double.MaxValue; - List unreadableSectors = new List(); Checksum dataChk; dev.RequestSense(out byte[] senseBuf, dev.Timeout, out double duration); @@ -372,8 +371,8 @@ namespace DiscImageChef.Core.Devices.Dumping Checksum fileChk; List partitions = new List(); List files = new List(); - TapeFileType currentTapeFile = new TapeFileType(); - TapePartitionType currentTapePartition = new TapePartitionType(); + TapeFileType currentTapeFile; + TapePartitionType currentTapePartition; DicConsole.WriteLine(); DataFile dumpFile = new DataFile(outputPrefix + ".bin"); diff --git a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs index d2bdabb6..1f653330 100644 --- a/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs +++ b/DiscImageChef.Core/Devices/Dumping/SecureDigital.cs @@ -83,7 +83,7 @@ namespace DiscImageChef.Core.Devices.Dumping uint blocksToRead = 128; uint blockSize = 512; ulong blocks = 0; - byte[] cid = null; + byte[] cid; byte[] csd = null; byte[] ocr = null; byte[] ecsd = null; diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index 7bab9189..8ffd3e0c 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -62,8 +62,8 @@ namespace DiscImageChef.Core.Devices.Dumping { MhddLog mhddLog; IbgLog ibgLog; - bool sense = false; - ulong blocks = 0; + bool sense; + ulong blocks; uint blockSize = 2048; uint blocksToRead = 64; ulong errored = 0; @@ -75,7 +75,7 @@ namespace DiscImageChef.Core.Devices.Dumping double maxSpeed = double.MinValue; double minSpeed = double.MaxValue; Checksum dataChk; - DataFile dumpFile = null; + DataFile dumpFile; bool aborted = false; System.Console.CancelKeyPress += (sender, e) => { e.Cancel = aborted = true; }; @@ -332,8 +332,6 @@ namespace DiscImageChef.Core.Devices.Dumping start = DateTime.UtcNow; - readBuffer = null; - double cmdDuration = 0; uint saveBlocksToRead = blocksToRead; DumpHardwareType currentTry = null; @@ -630,8 +628,6 @@ namespace DiscImageChef.Core.Devices.Dumping break; } - cmdDuration = 0; - DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, forward ? "forward" : "reverse", runningPersistent ? "recovering partial data, " : ""); @@ -661,8 +657,8 @@ namespace DiscImageChef.Core.Devices.Dumping Modes.DecodedMode? currentMode = null; Modes.ModePage? currentModePage = null; - byte[] md6 = null; - byte[] md10 = null; + byte[] md6; + byte[] md10; if(!runningPersistent && persistent) { diff --git a/DiscImageChef.Core/Devices/ReaderSCSI.cs b/DiscImageChef.Core/Devices/ReaderSCSI.cs index 593f33e5..53ce5521 100644 --- a/DiscImageChef.Core/Devices/ReaderSCSI.cs +++ b/DiscImageChef.Core/Devices/ReaderSCSI.cs @@ -441,25 +441,25 @@ namespace DiscImageChef.Core.Devices { if(read16) { - sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, LogicalBlockSize, 0, + dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, LogicalBlockSize, 0, BlocksToRead, false, timeout, out duration); if(dev.Error) BlocksToRead /= 2; } else if(read12) { - sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, LogicalBlockSize, 0, + dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, LogicalBlockSize, 0, BlocksToRead, false, timeout, out duration); if(dev.Error) BlocksToRead /= 2; } else if(read10) { - sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, LogicalBlockSize, 0, + dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, LogicalBlockSize, 0, (ushort)BlocksToRead, timeout, out duration); if(dev.Error) BlocksToRead /= 2; } else if(read6) { - sense = dev.Read6(out readBuffer, out senseBuf, 0, LogicalBlockSize, (byte)BlocksToRead, timeout, + dev.Read6(out readBuffer, out senseBuf, 0, LogicalBlockSize, (byte)BlocksToRead, timeout, out duration); if(dev.Error) BlocksToRead /= 2; } @@ -522,7 +522,7 @@ namespace DiscImageChef.Core.Devices DicConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}", Sense.PrettifySense(senseBuf)); - return true; + return sense; } bool ScsiSeek(ulong block, out double duration) diff --git a/DiscImageChef.Core/Devices/Report/ATA.cs b/DiscImageChef.Core/Devices/Report/ATA.cs index 8b9be31d..338cf426 100644 --- a/DiscImageChef.Core/Devices/Report/ATA.cs +++ b/DiscImageChef.Core/Devices/Report/ATA.cs @@ -590,7 +590,7 @@ namespace DiscImageChef.Core.Devices.Report mediaTest.NominalRotationRateSpecified = true; } - uint logicalsectorsize = 0; + uint logicalsectorsize; uint physicalsectorsize; if((ataId.PhysLogSectorSize & 0x8000) == 0x0000 && (ataId.PhysLogSectorSize & 0x4000) == 0x4000) @@ -682,7 +682,7 @@ namespace DiscImageChef.Core.Devices.Report byte[] readBuf; ulong checkCorrectRead = BitConverter.ToUInt64(buffer, 0); - bool sense = true; + bool sense; DicConsole.WriteLine("Trying READ SECTOR(S) in CHS mode..."); sense = dev.Read(out readBuf, out errorChs, false, 0, 0, 1, 1, timeout, out duration); @@ -961,7 +961,7 @@ namespace DiscImageChef.Core.Devices.Report report.ATA.ReadCapabilities.NominalRotationRateSpecified = true; } - uint logicalsectorsize = 0; + uint logicalsectorsize; uint physicalsectorsize; if((ataId.PhysLogSectorSize & 0x8000) == 0x0000 && (ataId.PhysLogSectorSize & 0x4000) == 0x4000) { @@ -1052,7 +1052,7 @@ namespace DiscImageChef.Core.Devices.Report byte[] readBuf; ulong checkCorrectRead = BitConverter.ToUInt64(buffer, 0); - bool sense = true; + bool sense; DicConsole.WriteLine("Trying READ SECTOR(S) in CHS mode..."); sense = dev.Read(out readBuf, out errorChs, false, 0, 0, 1, 1, timeout, out duration); diff --git a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs index 07a19647..2bdc4e13 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs @@ -56,7 +56,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI bool sense; uint timeout = 5; ConsoleKeyInfo pressedKey; - Modes.DecodedMode? decMode = null; + Modes.DecodedMode? decMode; report.SCSI.MultiMediaDevice = new mmcType(); diff --git a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs index 931e394a..a2be6d90 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs @@ -53,7 +53,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI bool sense; uint timeout = 5; ConsoleKeyInfo pressedKey; - Modes.DecodedMode? decMode = null; + Modes.DecodedMode? decMode; report.SCSI.SequentialDevice = new sscType(); DicConsole.WriteLine("Querying SCSI READ BLOCK LIMITS..."); @@ -175,7 +175,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI seqTest.MediaIsRecognized = true; - sense = dev.Load(out senseBuffer, timeout, out duration); + dev.Load(out senseBuffer, timeout, out duration); sense = dev.ScsiTestUnitReady(out senseBuffer, timeout, out duration); if(sense) { diff --git a/DiscImageChef.Core/Devices/Scanning/ATA.cs b/DiscImageChef.Core/Devices/Scanning/ATA.cs index c40cd846..c1aa243a 100644 --- a/DiscImageChef.Core/Devices/Scanning/ATA.cs +++ b/DiscImageChef.Core/Devices/Scanning/ATA.cs @@ -53,7 +53,7 @@ namespace DiscImageChef.Core.Devices.Scanning ushort currentProfile = 0x0001; AtaErrorRegistersCHS errorChs; uint timeout = 5; - double duration = 0; + double duration; sense = dev.AtaIdentify(out cmdBuf, out errorChs); if(!sense && Identify.Decode(cmdBuf).HasValue) @@ -108,14 +108,14 @@ namespace DiscImageChef.Core.Devices.Scanning results.SeekTotal = 0; const int SEEK_TIMES = 1000; - double seekCur = 0; + double seekCur; Random rnd = new Random(); - uint seekPos = (uint)rnd.Next((int)results.Blocks); - ushort seekCy = (ushort)rnd.Next(cylinders); - byte seekHd = (byte)rnd.Next(heads); - byte seekSc = (byte)rnd.Next(sectors); + uint seekPos; + ushort seekCy; + byte seekHd; + byte seekSc; aborted = false; System.Console.CancelKeyPress += (sender, e) => { e.Cancel = aborted = true; }; diff --git a/DiscImageChef.Core/Statistics.cs b/DiscImageChef.Core/Statistics.cs index 1ad2c2db..6a2eb8f9 100644 --- a/DiscImageChef.Core/Statistics.cs +++ b/DiscImageChef.Core/Statistics.cs @@ -192,7 +192,7 @@ namespace DiscImageChef.Core FileStream fs = new FileStream(statsFile, FileMode.Open, FileAccess.Read); XmlSerializer xs = new XmlSerializer(stats.GetType()); - stats = (Stats)xs.Deserialize(fs); + xs.Deserialize(fs); // Just to test validity of stats file fs.Seek(0, SeekOrigin.Begin); WebRequest request = WebRequest.Create("http://discimagechef.claunia.com/api/uploadstats"); diff --git a/DiscImageChef.Decoders/ATA/Identify.cs b/DiscImageChef.Decoders/ATA/Identify.cs index a3cbb3a3..ae9a194e 100644 --- a/DiscImageChef.Decoders/ATA/Identify.cs +++ b/DiscImageChef.Decoders/ATA/Identify.cs @@ -1885,21 +1885,12 @@ namespace DiscImageChef.Decoders.ATA IdentifyDevice ATAID = IdentifyDeviceResponse.Value; if(ATAID.GeneralConfiguration.HasFlag(GeneralConfigurationBit.NonMagnetic)) if((ushort)ATAID.GeneralConfiguration != 0x848A) - { - //if (ATAID.CommandSet.HasFlag(CommandSetBit.Packet)) - //{ atapi = true; - cfa = false; - //} - } else - { - atapi = false; cfa = true; - } - if(atapi && !cfa) sb.AppendLine("ATAPI device"); - else if(!atapi && cfa) sb.AppendLine("CompactFlash device"); + if(atapi) sb.AppendLine("ATAPI device"); + else if(cfa) sb.AppendLine("CompactFlash device"); else sb.AppendLine("ATA device"); if(ATAID.Model != "") sb.AppendFormat("Model: {0}", ATAID.Model).AppendLine(); diff --git a/DiscImageChef.Decoders/CD/ATIP.cs b/DiscImageChef.Decoders/CD/ATIP.cs index 2867657e..8356842c 100644 --- a/DiscImageChef.Decoders/CD/ATIP.cs +++ b/DiscImageChef.Decoders/CD/ATIP.cs @@ -428,7 +428,7 @@ namespace DiscImageChef.Decoders.CD int type = response.LeadInStartFrame % 10; int frm = response.LeadInStartFrame - type; - string manufacturer = ""; + string manufacturer; if(response.DiscType) sb.AppendLine("Disc uses phase change"); else diff --git a/DiscImageChef.Decoders/Floppy/Apple2.cs b/DiscImageChef.Decoders/Floppy/Apple2.cs index 0d1cb245..c45af811 100644 --- a/DiscImageChef.Decoders/Floppy/Apple2.cs +++ b/DiscImageChef.Decoders/Floppy/Apple2.cs @@ -612,7 +612,7 @@ namespace DiscImageChef.Decoders.Floppy public static bool IsApple2GCR(byte[] data) { - int position = 0; + int position; RawSector sector = MarshalSector(data, out position, 0); return sector != null && position != 0; diff --git a/DiscImageChef.Decoders/Floppy/AppleSony.cs b/DiscImageChef.Decoders/Floppy/AppleSony.cs index 6302872b..98b1c2f7 100644 --- a/DiscImageChef.Decoders/Floppy/AppleSony.cs +++ b/DiscImageChef.Decoders/Floppy/AppleSony.cs @@ -495,7 +495,7 @@ namespace DiscImageChef.Decoders.Floppy public static bool IsAppleSonyGCR(byte[] data) { - int position = 0; + int position; RawSector sector = MarshalSector(data, out position, 0); return sector != null && position != 0; diff --git a/DiscImageChef.Decoders/LisaTag.cs b/DiscImageChef.Decoders/LisaTag.cs index d6463528..ce7638b7 100644 --- a/DiscImageChef.Decoders/LisaTag.cs +++ b/DiscImageChef.Decoders/LisaTag.cs @@ -293,7 +293,7 @@ namespace DiscImageChef.Decoders { if(tag == null) return null; - PriamTag pmTag = new PriamTag(); + PriamTag pmTag; switch(tag.Length) { diff --git a/DiscImageChef.Decoders/MMC/CID.cs b/DiscImageChef.Decoders/MMC/CID.cs index 76cbfb78..34e3cca9 100644 --- a/DiscImageChef.Decoders/MMC/CID.cs +++ b/DiscImageChef.Decoders/MMC/CID.cs @@ -56,7 +56,7 @@ namespace DiscImageChef.Decoders.MMC if(response.Length != 4) return null; byte[] data = new byte[16]; - byte[] tmp = new byte[4]; + byte[] tmp; tmp = BitConverter.GetBytes(response[0]); Array.Copy(tmp, 0, data, 0, 4); @@ -85,7 +85,6 @@ namespace DiscImageChef.Decoders.MMC Array.Copy(response, 3, tmp, 0, 6); cid.ProductName = StringHandlers.CToString(tmp); cid.ProductRevision = response[9]; - tmp = new byte[4]; cid.ProductSerialNumber = BitConverter.ToUInt32(response, 10); cid.ManufacturingDate = response[14]; cid.CRC = (byte)((response[15] & 0xFE) >> 1); diff --git a/DiscImageChef.Decoders/MMC/CSD.cs b/DiscImageChef.Decoders/MMC/CSD.cs index 8418f3fa..74cf3a84 100644 --- a/DiscImageChef.Decoders/MMC/CSD.cs +++ b/DiscImageChef.Decoders/MMC/CSD.cs @@ -81,7 +81,7 @@ namespace DiscImageChef.Decoders.MMC if(response.Length != 4) return null; byte[] data = new byte[16]; - byte[] tmp = new byte[4]; + byte[] tmp; tmp = BitConverter.GetBytes(response[0]); Array.Copy(tmp, 0, data, 0, 4); @@ -146,7 +146,7 @@ namespace DiscImageChef.Decoders.MMC double unitFactor = 0; double multiplier = 0; - double result = 0; + double result; string unit = ""; StringBuilder sb = new StringBuilder(); @@ -483,6 +483,7 @@ namespace DiscImageChef.Decoders.MMC if(csd.WriteProtectGroupEnable) { sb.AppendLine("\tDevice can write protect regions"); + // TODO: Check specification unitFactor = Convert.ToDouble(csd.WriteProtectGroupSize); sb.AppendFormat("\tDevice can write protect a minimum of {0} blocks at a time", (int)(result + 1)) .AppendLine(); diff --git a/DiscImageChef.Decoders/MMC/ExtendedCSD.cs b/DiscImageChef.Decoders/MMC/ExtendedCSD.cs index 991d72ef..cd517d46 100644 --- a/DiscImageChef.Decoders/MMC/ExtendedCSD.cs +++ b/DiscImageChef.Decoders/MMC/ExtendedCSD.cs @@ -205,7 +205,7 @@ namespace DiscImageChef.Decoders.MMC if(response.Length != 512) return null; - ExtendedCSD csd = new ExtendedCSD(); + ExtendedCSD csd; GCHandle handle = GCHandle.Alloc(response, GCHandleType.Pinned); csd = (ExtendedCSD)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(ExtendedCSD)); handle.Free(); diff --git a/DiscImageChef.Decoders/PCMCIA/CIS.cs b/DiscImageChef.Decoders/PCMCIA/CIS.cs index 8b74c68c..7c533fa2 100644 --- a/DiscImageChef.Decoders/PCMCIA/CIS.cs +++ b/DiscImageChef.Decoders/PCMCIA/CIS.cs @@ -237,6 +237,7 @@ namespace DiscImageChef.Decoders.PCMCIA continue; } + // TODO: Check this if(!secondString) { tuple.Product = StringHandlers.CToString(buffer.ToArray()); diff --git a/DiscImageChef.Decoders/SCSI/EVPD.cs b/DiscImageChef.Decoders/SCSI/EVPD.cs index b6d9bdeb..7035f8ed 100644 --- a/DiscImageChef.Decoders/SCSI/EVPD.cs +++ b/DiscImageChef.Decoders/SCSI/EVPD.cs @@ -467,7 +467,7 @@ namespace DiscImageChef.Decoders.SCSI if(descriptor.PIV) { - string protocol = ""; + string protocol; switch(descriptor.ProtocolIdentifier) { case ProtocolIdentifiers.ADT: diff --git a/DiscImageChef.Decoders/SCSI/Modes/11.cs b/DiscImageChef.Decoders/SCSI/Modes/11.cs index f4ad4002..41755f99 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/11.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/11.cs @@ -197,7 +197,7 @@ namespace DiscImageChef.Decoders.SCSI else if(page.CLEAR && page.ADDP) sb.AppendLine("\tDevice shall erase all partitions differing on size on MODE SELECT for partitioning"); - string measure = ""; + string measure; switch(page.PSUM) { diff --git a/DiscImageChef.Decoders/SCSI/Modes/Headers.cs b/DiscImageChef.Decoders/SCSI/Modes/Headers.cs index b6a8b21c..f81bc486 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/Headers.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/Headers.cs @@ -181,7 +181,7 @@ namespace DiscImageChef.Decoders.SCSI if(header.Value.WriteProtected) sb.AppendLine("\tMedium is write protected"); - string medium = ""; + string medium; switch(header.Value.MediumType) { diff --git a/DiscImageChef.Decoders/SecureDigital/CID.cs b/DiscImageChef.Decoders/SecureDigital/CID.cs index e0b4ee06..d00ba5ea 100644 --- a/DiscImageChef.Decoders/SecureDigital/CID.cs +++ b/DiscImageChef.Decoders/SecureDigital/CID.cs @@ -55,7 +55,7 @@ namespace DiscImageChef.Decoders.SecureDigital if(response.Length != 4) return null; byte[] data = new byte[16]; - byte[] tmp = new byte[4]; + byte[] tmp; tmp = BitConverter.GetBytes(response[0]); Array.Copy(tmp, 0, data, 0, 4); diff --git a/DiscImageChef.Decoders/SecureDigital/CSD.cs b/DiscImageChef.Decoders/SecureDigital/CSD.cs index 7feaadc5..ba404a54 100644 --- a/DiscImageChef.Decoders/SecureDigital/CSD.cs +++ b/DiscImageChef.Decoders/SecureDigital/CSD.cs @@ -77,7 +77,7 @@ namespace DiscImageChef.Decoders.SecureDigital if(response.Length != 4) return null; byte[] data = new byte[16]; - byte[] tmp = new byte[4]; + byte[] tmp; tmp = BitConverter.GetBytes(response[0]); Array.Copy(tmp, 0, data, 0, 4); @@ -142,7 +142,7 @@ namespace DiscImageChef.Decoders.SecureDigital double unitFactor = 0; double multiplier = 0; - double result = 0; + double result; string unit = ""; StringBuilder sb = new StringBuilder(); diff --git a/DiscImageChef.Decoders/SecureDigital/SCR.cs b/DiscImageChef.Decoders/SecureDigital/SCR.cs index 74bc5a12..35f27241 100644 --- a/DiscImageChef.Decoders/SecureDigital/SCR.cs +++ b/DiscImageChef.Decoders/SecureDigital/SCR.cs @@ -59,7 +59,7 @@ namespace DiscImageChef.Decoders.SecureDigital if(response.Length != 2) return null; byte[] data = new byte[8]; - byte[] tmp = new byte[4]; + byte[] tmp; tmp = BitConverter.GetBytes(response[0]); Array.Copy(tmp, 0, data, 0, 4); diff --git a/DiscImageChef.Decoders/Sega/CD.cs b/DiscImageChef.Decoders/Sega/CD.cs index f51cebab..758914f4 100644 --- a/DiscImageChef.Decoders/Sega/CD.cs +++ b/DiscImageChef.Decoders/Sega/CD.cs @@ -114,7 +114,7 @@ namespace DiscImageChef.Decoders.Sega if(ipbin_sector.Length < 512) return null; - IPBin ipbin = new IPBin(); + IPBin ipbin; IntPtr ptr = Marshal.AllocHGlobal(512); Marshal.Copy(ipbin_sector, 0, ptr, 512); ipbin = (IPBin)Marshal.PtrToStructure(ptr, typeof(IPBin)); diff --git a/DiscImageChef.Decoders/Sega/Dreamcast.cs b/DiscImageChef.Decoders/Sega/Dreamcast.cs index 55186d01..646d2c19 100644 --- a/DiscImageChef.Decoders/Sega/Dreamcast.cs +++ b/DiscImageChef.Decoders/Sega/Dreamcast.cs @@ -91,7 +91,7 @@ namespace DiscImageChef.Decoders.Sega if(ipbin_sector.Length < 512) return null; - IPBin ipbin = new IPBin(); + IPBin ipbin; IntPtr ptr = Marshal.AllocHGlobal(512); Marshal.Copy(ipbin_sector, 0, ptr, 512); ipbin = (IPBin)Marshal.PtrToStructure(ptr, typeof(IPBin)); diff --git a/DiscImageChef.Decoders/Sega/Saturn.cs b/DiscImageChef.Decoders/Sega/Saturn.cs index a334efac..220ffd29 100644 --- a/DiscImageChef.Decoders/Sega/Saturn.cs +++ b/DiscImageChef.Decoders/Sega/Saturn.cs @@ -77,7 +77,7 @@ namespace DiscImageChef.Decoders.Sega if(ipbin_sector.Length < 512) return null; - IPBin ipbin = new IPBin(); + IPBin ipbin; IntPtr ptr = Marshal.AllocHGlobal(512); Marshal.Copy(ipbin_sector, 0, ptr, 512); ipbin = (IPBin)Marshal.PtrToStructure(ptr, typeof(IPBin)); diff --git a/DiscImageChef.Devices/Device/Constructor.cs b/DiscImageChef.Devices/Device/Constructor.cs index 440702f3..3cc2b7e3 100644 --- a/DiscImageChef.Devices/Device/Constructor.cs +++ b/DiscImageChef.Devices/Device/Constructor.cs @@ -134,7 +134,7 @@ namespace DiscImageChef.Devices if(Error) throw new SystemException(string.Format("Error {0} trying device.", LastError)); bool scsiSense = true; - string ntDevicePath = null; + string ntDevicePath; // Windows is answering SCSI INQUIRY for all device types so it needs to be detected first switch(PlatformId) { @@ -240,7 +240,7 @@ namespace DiscImageChef.Devices if(Windows.Command.IsSdhci((SafeFileHandle)FileHandle)) { byte[] sdBuffer = new byte[16]; - bool sense = false; + bool sense; LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCsd, false, false, MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | @@ -254,7 +254,6 @@ namespace DiscImageChef.Devices } sdBuffer = new byte[16]; - sense = false; LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCid, false, false, MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | @@ -268,7 +267,6 @@ namespace DiscImageChef.Devices } sdBuffer = new byte[8]; - sense = false; LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, (MmcCommands)SecureDigitalCommands.SendScr, false, true, @@ -285,7 +283,6 @@ namespace DiscImageChef.Devices if(cachedScr != null) { sdBuffer = new byte[4]; - sense = false; LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, (MmcCommands)SecureDigitalCommands @@ -303,7 +300,6 @@ namespace DiscImageChef.Devices else { sdBuffer = new byte[4]; - sense = false; LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendOpCond, false, true, diff --git a/DiscImageChef.Devices/Device/MmcCommands/MMC.cs b/DiscImageChef.Devices/Device/MmcCommands/MMC.cs index 32c6bc0a..5bc7ad4c 100644 --- a/DiscImageChef.Devices/Device/MmcCommands/MMC.cs +++ b/DiscImageChef.Devices/Device/MmcCommands/MMC.cs @@ -39,7 +39,7 @@ namespace DiscImageChef.Devices public bool ReadCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration) { buffer = new byte[16]; - bool sense = false; + bool sense; LastError = SendMmcCommand(MmcCommands.SendCsd, false, false, MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1, @@ -54,7 +54,7 @@ namespace DiscImageChef.Devices public bool ReadCid(out byte[] buffer, out uint[] response, uint timeout, out double duration) { buffer = new byte[16]; - bool sense = false; + bool sense; LastError = SendMmcCommand(MmcCommands.SendCid, false, false, MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1, @@ -69,7 +69,7 @@ namespace DiscImageChef.Devices public bool ReadOcr(out byte[] buffer, out uint[] response, uint timeout, out double duration) { buffer = new byte[4]; - bool sense = false; + bool sense; LastError = SendMmcCommand(MmcCommands.SendOpCond, false, true, MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1, @@ -84,7 +84,7 @@ namespace DiscImageChef.Devices public bool ReadExtendedCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration) { buffer = new byte[512]; - bool sense = false; + bool sense; LastError = SendMmcCommand(MmcCommands.SendExtCsd, false, false, MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 512, 1, @@ -99,7 +99,7 @@ namespace DiscImageChef.Devices public bool SetBlockLength(uint length, out uint[] response, uint timeout, out double duration) { byte[] buffer = new byte[0]; - bool sense = false; + bool sense; LastError = SendMmcCommand(MmcCommands.SetBlocklen, false, false, MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length, 0, @@ -115,7 +115,7 @@ namespace DiscImageChef.Devices bool byteAddressed, uint timeout, out double duration) { buffer = new byte[transferLength * blockSize]; - bool sense = false; + bool sense; uint address; if(byteAddressed) address = lba * blockSize; else address = lba; diff --git a/DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs b/DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs index c5e3679d..baa69d3f 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs @@ -64,27 +64,13 @@ namespace DiscImageChef.Devices if(mode != FujitsuDisplayModes.Half) if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) && !ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes)) - { displayLen = true; - halfMsg = false; - } - else if(ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) && - !ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes)) - { - displayLen = false; - halfMsg = false; - } else if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) && ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes)) { displayLen = false; halfMsg = true; } - else - { - displayLen = false; - halfMsg = false; - } buffer[0] = (byte)((byte)mode << 5); if(displayLen) buffer[0] += 0x10; diff --git a/DiscImageChef.Devices/Linux/ListDevices.cs b/DiscImageChef.Devices/Linux/ListDevices.cs index 6f7433a8..4b5bccd0 100644 --- a/DiscImageChef.Devices/Linux/ListDevices.cs +++ b/DiscImageChef.Devices/Linux/ListDevices.cs @@ -48,7 +48,7 @@ namespace DiscImageChef.Devices.Linux StreamReader sr; IntPtr udev = IntPtr.Zero; - IntPtr udevDev = IntPtr.Zero; + IntPtr udevDev; try { diff --git a/DiscImageChef.Devices/Windows/UsbFunctions.cs b/DiscImageChef.Devices/Windows/UsbFunctions.cs index b125d3df..5db7dc26 100644 --- a/DiscImageChef.Devices/Windows/UsbFunctions.cs +++ b/DiscImageChef.Devices/Windows/UsbFunctions.cs @@ -210,7 +210,7 @@ namespace DiscImageChef.Devices.Windows IntPtr h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); if(h.ToInt32() != INVALID_HANDLE_VALUE) { - bool success = true; + bool success; int i = 0; do { diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs index f2694740..b6e67d4e 100644 --- a/DiscImageChef.DiscImages/Alcohol120.cs +++ b/DiscImageChef.DiscImages/Alcohol120.cs @@ -206,7 +206,7 @@ namespace DiscImageChef.DiscImages byte[] hdr = new byte[88]; stream.Read(hdr, 0, 88); - AlcoholHeader header = new AlcoholHeader(); + AlcoholHeader header; IntPtr hdrPtr = Marshal.AllocHGlobal(88); Marshal.Copy(hdr, 0, hdrPtr, 88); header = (AlcoholHeader)Marshal.PtrToStructure(hdrPtr, typeof(AlcoholHeader)); @@ -224,7 +224,7 @@ namespace DiscImageChef.DiscImages isDvd = false; byte[] hdr = new byte[88]; stream.Read(hdr, 0, 88); - AlcoholHeader header = new AlcoholHeader(); + AlcoholHeader header; IntPtr hdrPtr = Marshal.AllocHGlobal(88); Marshal.Copy(hdr, 0, hdrPtr, 88); header = (AlcoholHeader)Marshal.PtrToStructure(hdrPtr, typeof(AlcoholHeader)); @@ -263,7 +263,7 @@ namespace DiscImageChef.DiscImages { byte[] sesHdr = new byte[24]; stream.Read(sesHdr, 0, 24); - AlcoholSession session = new AlcoholSession(); + AlcoholSession session; IntPtr sesPtr = Marshal.AllocHGlobal(24); Marshal.Copy(sesHdr, 0, sesPtr, 24); session = (AlcoholSession)Marshal.PtrToStructure(sesPtr, typeof(AlcoholSession)); @@ -304,7 +304,6 @@ namespace DiscImageChef.DiscImages trkHdr = new byte[80]; stream.Read(trkHdr, 0, 80); - track = new AlcoholTrack(); trkPtr = Marshal.AllocHGlobal(80); Marshal.Copy(trkHdr, 0, trkPtr, 80); track = (AlcoholTrack)Marshal.PtrToStructure(trkPtr, typeof(AlcoholTrack)); @@ -370,7 +369,7 @@ namespace DiscImageChef.DiscImages byte[] extHdr = new byte[8]; stream.Seek(track.extraOffset, SeekOrigin.Begin); stream.Read(extHdr, 0, 8); - AlcoholTrackExtra extra = new AlcoholTrackExtra(); + AlcoholTrackExtra extra; IntPtr extPtr = Marshal.AllocHGlobal(8); Marshal.Copy(extHdr, 0, extPtr, 8); extra = (AlcoholTrackExtra)Marshal.PtrToStructure(extPtr, typeof(AlcoholTrackExtra)); @@ -1348,7 +1347,7 @@ namespace DiscImageChef.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - byte[] buffer = new byte[sector_size * length]; + byte[] buffer; imageStream = alcImage.GetDataForkStream(); BinaryReader br = new BinaryReader(imageStream); diff --git a/DiscImageChef.DiscImages/Apridisk.cs b/DiscImageChef.DiscImages/Apridisk.cs index acd7802a..74972c32 100644 --- a/DiscImageChef.DiscImages/Apridisk.cs +++ b/DiscImageChef.DiscImages/Apridisk.cs @@ -148,7 +148,7 @@ namespace DiscImageChef.DiscImages // Count cylinders while(stream.Position < stream.Length) { - ApridiskRecord record = new ApridiskRecord(); + ApridiskRecord record; byte[] rec_b = new byte[recordSize]; stream.Read(rec_b, 0, recordSize); @@ -241,7 +241,7 @@ namespace DiscImageChef.DiscImages stream.Seek(signature.Length, SeekOrigin.Begin); while(stream.Position < stream.Length) { - ApridiskRecord record = new ApridiskRecord(); + ApridiskRecord record; byte[] rec_b = new byte[recordSize]; stream.Read(rec_b, 0, recordSize); @@ -322,7 +322,7 @@ namespace DiscImageChef.DiscImages { int readp = 0; ushort blklen; - uint u_len = 0; + uint u_len; int c_len = compressed.Length; MemoryStream buffer = new MemoryStream(); diff --git a/DiscImageChef.DiscImages/BlindWrite4.cs b/DiscImageChef.DiscImages/BlindWrite4.cs index 69fd4afd..3f81cc66 100644 --- a/DiscImageChef.DiscImages/BlindWrite4.cs +++ b/DiscImageChef.DiscImages/BlindWrite4.cs @@ -1245,7 +1245,7 @@ namespace DiscImageChef.DiscImages default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - byte[] buffer = new byte[sectorSize * length]; + byte[] buffer; imageStream = _track.TrackFilter.GetDataForkStream(); BinaryReader br = new BinaryReader(imageStream); diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index e5a0df10..f79169ce 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -407,7 +407,7 @@ namespace DiscImageChef.DiscImages } tocStream = new StreamReader(this.imageFilter.GetDataForkStream()); - FiltersList filtersList = new FiltersList(); + FiltersList filtersList; line = 0; tocStream.BaseStream.Position = 0; @@ -416,7 +416,7 @@ namespace DiscImageChef.DiscImages line++; _line = tocStream.ReadLine(); - matchComment = regexComment.Match(_line ?? throw new ()); + matchComment = regexComment.Match(_line ?? throw new InvalidOperationException()); matchDiskType = regexDiskType.Match(_line); matchMcn = regexMcn.Match(_line); matchTrack = regexTrack.Match(_line); @@ -889,7 +889,6 @@ namespace DiscImageChef.DiscImages } partitions.Add(partition); - partition = new Partition(); } // Print partition map diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index 7930b3ff..f8411fb4 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -331,11 +331,9 @@ namespace DiscImageChef.DiscImages } cueStream = new StreamReader(this.imageFilter.GetDataForkStream()); - int line = 0; while(cueStream.Peek() >= 0) { - line++; string _line = cueStream.ReadLine(); Regex sr = new Regex(SESSION_REGEX); @@ -1179,7 +1177,6 @@ namespace DiscImageChef.DiscImages } partitions.Add(partition); - partition = new Partition(); } // Print offset map diff --git a/DiscImageChef.DiscImages/CHD.cs b/DiscImageChef.DiscImages/CHD.cs index ce02b88b..aee0e4af 100644 --- a/DiscImageChef.DiscImages/CHD.cs +++ b/DiscImageChef.DiscImages/CHD.cs @@ -616,7 +616,7 @@ namespace DiscImageChef.DiscImages { Stream stream = imageFilter.GetDataForkStream(); stream.Seek(0, SeekOrigin.Begin); - byte[] buffer = new byte[8]; + byte[] buffer; byte[] magic = new byte[8]; stream.Read(magic, 0, 8); if(!chdTag.SequenceEqual(magic)) return false; @@ -665,7 +665,7 @@ namespace DiscImageChef.DiscImages uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV1.totalhunks * 8 / 512); byte[] hunkSectorBytes = new byte[512]; - HunkSector hunkSector = new HunkSector(); + HunkSector hunkSector; for(int i = 0; i < hunkSectorCount; i++) { @@ -738,7 +738,7 @@ namespace DiscImageChef.DiscImages uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV2.totalhunks * 8 / 512); byte[] hunkSectorBytes = new byte[512]; - HunkSector hunkSector = new HunkSector(); + HunkSector hunkSector; for(int i = 0; i < hunkSectorCount; i++) { @@ -915,7 +915,7 @@ namespace DiscImageChef.DiscImages uint hunkSectorCount = (uint)Math.Ceiling((double)hunkTableSmall.Length * 4 / 512); byte[] hunkSectorBytes = new byte[512]; - HunkSectorSmall hunkSector = new HunkSectorSmall(); + HunkSectorSmall hunkSector; stream.Seek((long)hdrV5.mapoffset, SeekOrigin.Begin); @@ -1640,7 +1640,7 @@ namespace DiscImageChef.DiscImages ulong GetAbsoluteSector(ulong relativeSector, uint track) { - Track _track = new Track(); + Track _track; tracks.TryGetValue(track, out _track); return _track.TrackStartSector + relativeSector; } @@ -1678,7 +1678,6 @@ namespace DiscImageChef.DiscImages read, sectorsPerHunk * ImageInfo.SectorSize)); zStream.Close(); - zStream = null; } break; @@ -1711,7 +1710,6 @@ namespace DiscImageChef.DiscImages read, bytesPerHunk)); zStream.Close(); - zStream = null; } // TODO: Guess wth is MAME doing with these hunks else @@ -1734,7 +1732,7 @@ namespace DiscImageChef.DiscImages break; case Chdv3EntryFlags.Mini: hunk = new byte[bytesPerHunk]; - byte[] mini = new byte[8]; + byte[] mini; mini = BigEndianBitConverter.GetBytes(entry.offset); for(int i = 0; i < bytesPerHunk; i++) hunk[i] = mini[i % 8]; diff --git a/DiscImageChef.DiscImages/CPCDSK.cs b/DiscImageChef.DiscImages/CPCDSK.cs index 38150d29..8f3da245 100644 --- a/DiscImageChef.DiscImages/CPCDSK.cs +++ b/DiscImageChef.DiscImages/CPCDSK.cs @@ -239,7 +239,7 @@ namespace DiscImageChef.DiscImages byte[] headerB = new byte[256]; stream.Read(headerB, 0, 256); - CpcDiskInfo header = new CpcDiskInfo(); + CpcDiskInfo header; IntPtr headerPtr = Marshal.AllocHGlobal(256); Marshal.Copy(headerB, 0, headerPtr, 256); header = (CpcDiskInfo)Marshal.PtrToStructure(headerPtr, typeof(CpcDiskInfo)); @@ -261,7 +261,7 @@ namespace DiscImageChef.DiscImages byte[] headerB = new byte[256]; stream.Read(headerB, 0, 256); - CpcDiskInfo header = new CpcDiskInfo(); + CpcDiskInfo header; IntPtr headerPtr = Marshal.AllocHGlobal(256); Marshal.Copy(headerB, 0, headerPtr, 256); header = (CpcDiskInfo)Marshal.PtrToStructure(headerPtr, typeof(CpcDiskInfo)); @@ -309,7 +309,7 @@ namespace DiscImageChef.DiscImages byte[] trackB = new byte[256]; stream.Read(trackB, 0, 256); - CpcTrackInfo trackInfo = new CpcTrackInfo(); + CpcTrackInfo trackInfo; IntPtr trackPtr = Marshal.AllocHGlobal(256); Marshal.Copy(trackB, 0, trackPtr, 256); trackInfo = (CpcTrackInfo)Marshal.PtrToStructure(trackPtr, typeof(CpcTrackInfo)); diff --git a/DiscImageChef.DiscImages/CisCopy.cs b/DiscImageChef.DiscImages/CisCopy.cs index ee6afb66..30a697ce 100644 --- a/DiscImageChef.DiscImages/CisCopy.cs +++ b/DiscImageChef.DiscImages/CisCopy.cs @@ -121,7 +121,7 @@ namespace DiscImageChef.DiscImages stream.Seek(0, SeekOrigin.Begin); DiskType type = (DiskType)stream.ReadByte(); - byte tracks = 0; + byte tracks; switch(type) { @@ -192,7 +192,7 @@ namespace DiscImageChef.DiscImages MemoryStream decodedImage; DiskType type = (DiskType)stream.ReadByte(); - byte tracks = 0; + byte tracks; switch(type) { diff --git a/DiscImageChef.DiscImages/DiscJuggler.cs b/DiscImageChef.DiscImages/DiscJuggler.cs index 2346b5a0..32f7f2d8 100644 --- a/DiscImageChef.DiscImages/DiscJuggler.cs +++ b/DiscImageChef.DiscImages/DiscJuggler.cs @@ -174,7 +174,6 @@ namespace DiscImageChef.DiscImages // Read track for(byte t = 0; t < maxT; t++) { - addedATrack = false; DicConsole.DebugWriteLine("DiscJuggler plugin", "t = {0}", t); Track track = new Track(); diff --git a/DiscImageChef.DiscImages/DriDiskCopy.cs b/DiscImageChef.DiscImages/DriDiskCopy.cs index 86587b82..131093a8 100644 --- a/DiscImageChef.DiscImages/DriDiskCopy.cs +++ b/DiscImageChef.DiscImages/DriDiskCopy.cs @@ -166,7 +166,7 @@ namespace DiscImageChef.DiscImages stream.Seek(-buffer.Length, SeekOrigin.End); stream.Read(buffer, 0, buffer.Length); - DriFooter tmpFooter = new DriFooter(); + DriFooter tmpFooter; IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length); Marshal.Copy(buffer, 0, ftrPtr, buffer.Length); tmpFooter = (DriFooter)Marshal.PtrToStructure(ftrPtr, typeof(DriFooter)); diff --git a/DiscImageChef.DiscImages/KryoFlux.cs b/DiscImageChef.DiscImages/KryoFlux.cs index 99c6ee00..c08bc25f 100644 --- a/DiscImageChef.DiscImages/KryoFlux.cs +++ b/DiscImageChef.DiscImages/KryoFlux.cs @@ -233,7 +233,6 @@ namespace DiscImageChef.DiscImages else { DicConsole.DebugWriteLine("KryoFlux plugin", "Arrived end of disk at cylinder {0}", cylinder); - step = 2; break; } diff --git a/DiscImageChef.DiscImages/MaxiDisk.cs b/DiscImageChef.DiscImages/MaxiDisk.cs index 4d6d1c88..ec67624a 100644 --- a/DiscImageChef.DiscImages/MaxiDisk.cs +++ b/DiscImageChef.DiscImages/MaxiDisk.cs @@ -113,7 +113,7 @@ namespace DiscImageChef.DiscImages stream.Seek(0, SeekOrigin.Begin); stream.Read(buffer, 0, buffer.Length); - HdkHeader tmp_header = new HdkHeader(); + HdkHeader tmp_header; IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length); Marshal.Copy(buffer, 0, ftrPtr, buffer.Length); tmp_header = (HdkHeader)Marshal.PtrToStructure(ftrPtr, typeof(HdkHeader)); @@ -159,7 +159,7 @@ namespace DiscImageChef.DiscImages stream.Seek(0, SeekOrigin.Begin); stream.Read(buffer, 0, buffer.Length); - HdkHeader tmp_header = new HdkHeader(); + HdkHeader tmp_header; IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length); Marshal.Copy(buffer, 0, ftrPtr, buffer.Length); tmp_header = (HdkHeader)Marshal.PtrToStructure(ftrPtr, typeof(HdkHeader)); diff --git a/DiscImageChef.DiscImages/NDIF.cs b/DiscImageChef.DiscImages/NDIF.cs index 3637ef78..cb93d619 100644 --- a/DiscImageChef.DiscImages/NDIF.cs +++ b/DiscImageChef.DiscImages/NDIF.cs @@ -515,7 +515,6 @@ namespace DiscImageChef.DiscImages int realSize = decStream.Read(tmpBuffer, 0, (int)buffersize); buffer = new byte[realSize]; Array.Copy(tmpBuffer, 0, buffer, 0, realSize); - tmpBuffer = null; if(currentChunkCacheSize + realSize > MAX_CACHE_SIZE) { diff --git a/DiscImageChef.DiscImages/QCOW.cs b/DiscImageChef.DiscImages/QCOW.cs index c8797757..4027bc8b 100644 --- a/DiscImageChef.DiscImages/QCOW.cs +++ b/DiscImageChef.DiscImages/QCOW.cs @@ -349,8 +349,8 @@ namespace DiscImageChef.DiscImages { if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED) { - ulong compSizeMask = 0; - ulong offMask = 0; + ulong compSizeMask; + ulong offMask; compSizeMask = (ulong)(1 << qHdr.cluster_bits) - 1; compSizeMask <<= 63 - qHdr.cluster_bits; diff --git a/DiscImageChef.DiscImages/QCOW2.cs b/DiscImageChef.DiscImages/QCOW2.cs index 58e94da2..d7189007 100644 --- a/DiscImageChef.DiscImages/QCOW2.cs +++ b/DiscImageChef.DiscImages/QCOW2.cs @@ -396,8 +396,8 @@ namespace DiscImageChef.DiscImages { if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED) { - ulong compSizeMask = 0; - ulong offMask = 0; + ulong compSizeMask; + ulong offMask; compSizeMask = (ulong)(1 << (int)(qHdr.cluster_bits - 8)) - 1; byte countbits = (byte)(qHdr.cluster_bits - 8); diff --git a/DiscImageChef.DiscImages/RayDIM.cs b/DiscImageChef.DiscImages/RayDIM.cs index b2f0daf2..a26588e1 100644 --- a/DiscImageChef.DiscImages/RayDIM.cs +++ b/DiscImageChef.DiscImages/RayDIM.cs @@ -107,7 +107,7 @@ namespace DiscImageChef.DiscImages stream.Seek(0, SeekOrigin.Begin); stream.Read(buffer, 0, buffer.Length); - RayHdr header = new RayHdr(); + RayHdr header; IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length); Marshal.Copy(buffer, 0, ftrPtr, buffer.Length); header = (RayHdr)Marshal.PtrToStructure(ftrPtr, typeof(RayHdr)); @@ -141,7 +141,7 @@ namespace DiscImageChef.DiscImages stream.Seek(0, SeekOrigin.Begin); stream.Read(buffer, 0, buffer.Length); - RayHdr header = new RayHdr(); + RayHdr header; IntPtr ftrPtr = Marshal.AllocHGlobal(buffer.Length); Marshal.Copy(buffer, 0, ftrPtr, buffer.Length); header = (RayHdr)Marshal.PtrToStructure(ftrPtr, typeof(RayHdr)); diff --git a/DiscImageChef.DiscImages/SaveDskF.cs b/DiscImageChef.DiscImages/SaveDskF.cs index 7783fa3f..a649ad0b 100644 --- a/DiscImageChef.DiscImages/SaveDskF.cs +++ b/DiscImageChef.DiscImages/SaveDskF.cs @@ -198,7 +198,7 @@ namespace DiscImageChef.DiscImages calculatedChk = 0; stream.Seek(0, SeekOrigin.Begin); - int b = 0; + int b; do { b = stream.ReadByte(); diff --git a/DiscImageChef.DiscImages/TeleDisk.cs b/DiscImageChef.DiscImages/TeleDisk.cs index 09c9e183..f0c327d2 100644 --- a/DiscImageChef.DiscImages/TeleDisk.cs +++ b/DiscImageChef.DiscImages/TeleDisk.cs @@ -354,7 +354,7 @@ namespace DiscImageChef.DiscImages if(header.Signature == TD_ADV_COMP_MAGIC) { int rd; - byte[] obuf = new byte[BUFSZ]; + byte[] obuf; inStream.Seek(12, SeekOrigin.Begin); stream.Seek(12, SeekOrigin.Begin); init_Decode(); @@ -369,7 +369,6 @@ namespace DiscImageChef.DiscImages inStream.Read(copybuf, 0, copybuf.Length); stream.Seek(0, SeekOrigin.Begin); stream.Write(copybuf, 0, copybuf.Length); - copybuf = null; } stream.Seek(12, SeekOrigin.Begin); diff --git a/DiscImageChef.DiscImages/UDIF.cs b/DiscImageChef.DiscImages/UDIF.cs index ae157321..f2ca7bf4 100644 --- a/DiscImageChef.DiscImages/UDIF.cs +++ b/DiscImageChef.DiscImages/UDIF.cs @@ -567,7 +567,6 @@ namespace DiscImageChef.DiscImages int realSize = decStream.Read(tmpBuffer, 0, (int)buffersize); buffer = new byte[realSize]; Array.Copy(tmpBuffer, 0, buffer, 0, realSize); - tmpBuffer = null; if(currentChunkCacheSize + realSize > MAX_CACHE_SIZE) { diff --git a/DiscImageChef.DiscImages/VHD.cs b/DiscImageChef.DiscImages/VHD.cs index 42246162..5df3c033 100644 --- a/DiscImageChef.DiscImages/VHD.cs +++ b/DiscImageChef.DiscImages/VHD.cs @@ -787,7 +787,7 @@ namespace DiscImageChef.DiscImages uint batSectorCount = (uint)Math.Ceiling((double)thisDynamic.MaxTableEntries * 4 / 512); byte[] batSectorBytes = new byte[512]; - BatSector batSector = new BatSector(); + BatSector batSector; // Unsafe and fast code. It takes 4 ms to fill a 30720 entries BAT for(int i = 0; i < batSectorCount; i++) diff --git a/DiscImageChef.DiscImages/VHDX.cs b/DiscImageChef.DiscImages/VHDX.cs index 5584f308..4c9b83ce 100644 --- a/DiscImageChef.DiscImages/VHDX.cs +++ b/DiscImageChef.DiscImages/VHDX.cs @@ -847,7 +847,6 @@ namespace DiscImageChef.DiscImages } bool partialBlock; - partialBlock = !((blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_FULLY_PRESENT); partialBlock = (blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_PARTIALLY_PRESENT; if(partialBlock && hasParent && !CheckBitmap(sectorAddress)) return parentImage.ReadSector(sectorAddress); diff --git a/DiscImageChef.DiscImages/VMware.cs b/DiscImageChef.DiscImages/VMware.cs index 595f4276..44824da7 100644 --- a/DiscImageChef.DiscImages/VMware.cs +++ b/DiscImageChef.DiscImages/VMware.cs @@ -775,7 +775,7 @@ namespace DiscImageChef.DiscImages return sector; } - byte[] grain = new byte[SECTOR_SIZE * grainSize]; + byte[] grain; if(!grainCache.TryGetValue(grainOff, out grain)) { diff --git a/DiscImageChef.Filesystems/AppleDOS/Dir.cs b/DiscImageChef.Filesystems/AppleDOS/Dir.cs index 3cb85fee..bc2ad088 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Dir.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Dir.cs @@ -97,7 +97,7 @@ namespace DiscImageChef.Filesystems.AppleDOS if(debug) catalogMs.Write(catSectorB, 0, catSectorB.Length); // Read the catalog sector - CatalogSector catSector = new CatalogSector(); + CatalogSector catSector; IntPtr catPtr = Marshal.AllocHGlobal(256); Marshal.Copy(catSectorB, 0, catPtr, 256); catSector = (CatalogSector)Marshal.PtrToStructure(catPtr, typeof(CatalogSector)); diff --git a/DiscImageChef.Filesystems/AppleDOS/File.cs b/DiscImageChef.Filesystems/AppleDOS/File.cs index c6e43cee..685b45e1 100644 --- a/DiscImageChef.Filesystems/AppleDOS/File.cs +++ b/DiscImageChef.Filesystems/AppleDOS/File.cs @@ -182,7 +182,7 @@ namespace DiscImageChef.Filesystems.AppleDOS if(debug) tsListMs.Write(tsSectorB, 0, tsSectorB.Length); // Read the track/sector list sector - TrackSectorList tsSector = new TrackSectorList(); + TrackSectorList tsSector; IntPtr tsPtr = Marshal.AllocHGlobal(256); Marshal.Copy(tsSectorB, 0, tsPtr, 256); tsSector = (TrackSectorList)Marshal.PtrToStructure(tsPtr, typeof(TrackSectorList)); diff --git a/DiscImageChef.Filesystems/AppleDOS/Info.cs b/DiscImageChef.Filesystems/AppleDOS/Info.cs index c27c30e5..a901c79f 100644 --- a/DiscImageChef.Filesystems/AppleDOS/Info.cs +++ b/DiscImageChef.Filesystems/AppleDOS/Info.cs @@ -47,7 +47,7 @@ namespace DiscImageChef.Filesystems.AppleDOS if(partition.Start > 0 || imagePlugin.ImageInfo.SectorSize != 256) return false; - int spt = 0; + int spt; if(imagePlugin.ImageInfo.Sectors == 455) spt = 13; else spt = 16; @@ -67,7 +67,7 @@ namespace DiscImageChef.Filesystems.AppleDOS information = ""; StringBuilder sb = new StringBuilder(); - int spt = 0; + int spt; if(imagePlugin.ImageInfo.Sectors == 455) spt = 13; else spt = 16; diff --git a/DiscImageChef.Filesystems/AppleHFS.cs b/DiscImageChef.Filesystems/AppleHFS.cs index 69395388..2113e391 100644 --- a/DiscImageChef.Filesystems/AppleHFS.cs +++ b/DiscImageChef.Filesystems/AppleHFS.cs @@ -126,8 +126,8 @@ namespace DiscImageChef.Filesystems StringBuilder sb = new StringBuilder(); - HFS_MasterDirectoryBlock MDB = new HFS_MasterDirectoryBlock(); - HFS_BootBlock BB = new HFS_BootBlock(); + HFS_MasterDirectoryBlock MDB; + HFS_BootBlock BB; byte[] bb_sector = null; byte[] mdb_sector = null; diff --git a/DiscImageChef.Filesystems/AtheOS.cs b/DiscImageChef.Filesystems/AtheOS.cs index 274a3c59..045d63e6 100644 --- a/DiscImageChef.Filesystems/AtheOS.cs +++ b/DiscImageChef.Filesystems/AtheOS.cs @@ -102,7 +102,7 @@ namespace DiscImageChef.Filesystems StringBuilder sb = new StringBuilder(); - AtheosSuperBlock afs_sb = new AtheosSuperBlock(); + AtheosSuperBlock afs_sb; ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.GetSectorSize(); uint offset = AFS_BOOTBLOCK_SIZE % imagePlugin.GetSectorSize(); diff --git a/DiscImageChef.Filesystems/BFS.cs b/DiscImageChef.Filesystems/BFS.cs index 3405bdda..a8c87853 100644 --- a/DiscImageChef.Filesystems/BFS.cs +++ b/DiscImageChef.Filesystems/BFS.cs @@ -122,7 +122,7 @@ namespace DiscImageChef.Filesystems byte[] sb_sector = imagePlugin.ReadSector(0 + partition.Start); - bool littleEndian = true; + bool littleEndian; besb.magic1 = BigEndianBitConverter.ToUInt32(sb_sector, 0x20); if(besb.magic1 == BEFS_MAGIC1 || besb.magic1 == BEFS_CIGAM1) // Magic is at offset diff --git a/DiscImageChef.Filesystems/CPM/Dir.cs b/DiscImageChef.Filesystems/CPM/Dir.cs index 9d95ee2a..7a40cc23 100644 --- a/DiscImageChef.Filesystems/CPM/Dir.cs +++ b/DiscImageChef.Filesystems/CPM/Dir.cs @@ -69,7 +69,7 @@ namespace DiscImageChef.Filesystems.CPM for(int off = 0; off < directory.Length; off += 32) { - DirectoryEntry entry = new DirectoryEntry(); + DirectoryEntry entry; IntPtr dirPtr = Marshal.AllocHGlobal(32); Marshal.Copy(directory, off, dirPtr, 32); entry = (DirectoryEntry)Marshal.PtrToStructure(dirPtr, typeof(DirectoryEntry)); diff --git a/DiscImageChef.Filesystems/CPM/Info.cs b/DiscImageChef.Filesystems/CPM/Info.cs index ceecef10..4904ae8b 100644 --- a/DiscImageChef.Filesystems/CPM/Info.cs +++ b/DiscImageChef.Filesystems/CPM/Info.cs @@ -188,7 +188,7 @@ namespace DiscImageChef.Filesystems.CPM if(sig1 == 0x4D2F5043 && sig2 == 0x004B5344 && sig3 == sig1) amsSbOffset = 0x80; // Read the superblock - AmstradSuperBlock amsSb = new AmstradSuperBlock(); + AmstradSuperBlock amsSb; IntPtr amsPtr = Marshal.AllocHGlobal(16); Marshal.Copy(sector, amsSbOffset, amsPtr, 16); amsSb = (AmstradSuperBlock)Marshal.PtrToStructure(amsPtr, typeof(AmstradSuperBlock)); @@ -992,7 +992,7 @@ namespace DiscImageChef.Filesystems.CPM .AppendLine(); int interleaveSide1; - int interleaveSide2 = 1; + int interleaveSide2; if(workingDefinition.side1.sectorIds.Length >= 2) { diff --git a/DiscImageChef.Filesystems/CPM/Super.cs b/DiscImageChef.Filesystems/CPM/Super.cs index 387c10fb..6ba56117 100644 --- a/DiscImageChef.Filesystems/CPM/Super.cs +++ b/DiscImageChef.Filesystems/CPM/Super.cs @@ -219,7 +219,7 @@ namespace DiscImageChef.Filesystems.CPM if((directory[dOff] & 0x7F) < 0x10) if(allocationBlocks.Count > 256) { - DirectoryEntry16 entry = new DirectoryEntry16(); + DirectoryEntry16 entry; dirPtr = Marshal.AllocHGlobal(32); Marshal.Copy(directory, dOff, dirPtr, 32); entry = (DirectoryEntry16)Marshal.PtrToStructure(dirPtr, typeof(DirectoryEntry16)); @@ -313,7 +313,7 @@ namespace DiscImageChef.Filesystems.CPM } else { - DirectoryEntry entry = new DirectoryEntry(); + DirectoryEntry entry; dirPtr = Marshal.AllocHGlobal(32); Marshal.Copy(directory, dOff, dirPtr, 32); entry = (DirectoryEntry)Marshal.PtrToStructure(dirPtr, typeof(DirectoryEntry)); @@ -408,7 +408,7 @@ namespace DiscImageChef.Filesystems.CPM // A password entry (or a file entry in PDOS, but this does not handle that case) else if((directory[dOff] & 0x7F) >= 0x10 && (directory[dOff] & 0x7F) < 0x20) { - PasswordEntry entry = new PasswordEntry(); + PasswordEntry entry; dirPtr = Marshal.AllocHGlobal(32); Marshal.Copy(directory, dOff, dirPtr, 32); entry = (PasswordEntry)Marshal.PtrToStructure(dirPtr, typeof(PasswordEntry)); @@ -617,7 +617,7 @@ namespace DiscImageChef.Filesystems.CPM foreach(string filename in dirList) { MemoryStream fileMs = new MemoryStream(); - FileEntryInfo fInfo = new FileEntryInfo(); + FileEntryInfo fInfo; if(statCache.TryGetValue(filename, out fInfo)) statCache.Remove(filename); @@ -633,7 +633,7 @@ namespace DiscImageChef.Filesystems.CPM foreach(ushort alBlk in alBlks) { - byte[] blk = new byte[blockSize]; + byte[] blk; allocationBlocks.TryGetValue(alBlk, out blk); fileMs.Write(blk, 0, blk.Length); fInfo.Blocks++; diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs index 8d3bc2b4..07f6fd81 100644 --- a/DiscImageChef.Filesystems/FAT.cs +++ b/DiscImageChef.Filesystems/FAT.cs @@ -249,7 +249,6 @@ namespace DiscImageChef.Filesystems { rootMs.Write(tmp, 0, tmp.Length); } byte[] root_dir = rootMs.ToArray(); - rootMs = null; bool valid_root_dir = true; // Iterate all root directory @@ -612,7 +611,6 @@ namespace DiscImageChef.Filesystems { rootMs.Write(tmp, 0, tmp.Length); } byte[] root_dir = rootMs.ToArray(); - rootMs = null; bool valid_root_dir = true; // Iterate all root directory @@ -1313,7 +1311,6 @@ namespace DiscImageChef.Filesystems { rootMs.Write(tmp, 0, tmp.Length); } root_directory = rootMs.ToArray(); - rootMs = null; } for(int i = 0; i < root_directory.Length; i += 32) diff --git a/DiscImageChef.Filesystems/FATX.cs b/DiscImageChef.Filesystems/FATX.cs index c99385b1..5818e28b 100644 --- a/DiscImageChef.Filesystems/FATX.cs +++ b/DiscImageChef.Filesystems/FATX.cs @@ -78,7 +78,7 @@ namespace DiscImageChef.Filesystems { if(imagePlugin.GetSectorSize() < 512) return false; - FATX_Superblock fatxSb = new FATX_Superblock(); + FATX_Superblock fatxSb; byte[] sector = imagePlugin.ReadSector(partition.Start); fatxSb = BigEndianMarshal.ByteArrayToStructureBigEndian(sector); @@ -92,7 +92,7 @@ namespace DiscImageChef.Filesystems information = ""; if(imagePlugin.GetSectorSize() < 512) return; - FATX_Superblock fatxSb = new FATX_Superblock(); + FATX_Superblock fatxSb; byte[] sector = imagePlugin.ReadSector(partition.Start); diff --git a/DiscImageChef.Filesystems/Fossil.cs b/DiscImageChef.Filesystems/Fossil.cs index d71245f8..0749b8a9 100644 --- a/DiscImageChef.Filesystems/Fossil.cs +++ b/DiscImageChef.Filesystems/Fossil.cs @@ -153,7 +153,7 @@ namespace DiscImageChef.Filesystems { ulong hdrSector = HeaderPos / imagePlugin.GetSectorSize(); - FossilHeader hdr = new FossilHeader(); + FossilHeader hdr; if(partition.Start + hdrSector > imagePlugin.GetSectors()) return false; @@ -174,7 +174,7 @@ namespace DiscImageChef.Filesystems ulong hdrSector = HeaderPos / imagePlugin.GetSectorSize(); - FossilHeader hdr = new FossilHeader(); + FossilHeader hdr; byte[] sector = imagePlugin.ReadSector(partition.Start + hdrSector); hdr = BigEndianMarshal.ByteArrayToStructureBigEndian(sector); diff --git a/DiscImageChef.Filesystems/HAMMER.cs b/DiscImageChef.Filesystems/HAMMER.cs index ed6cad64..f5987198 100644 --- a/DiscImageChef.Filesystems/HAMMER.cs +++ b/DiscImageChef.Filesystems/HAMMER.cs @@ -97,7 +97,7 @@ namespace DiscImageChef.Filesystems StringBuilder sb = new StringBuilder(); - HammerSuperBlock hammer_sb = new HammerSuperBlock(); + HammerSuperBlock hammer_sb; uint run = HAMMER_VOLHDR_SIZE / imagePlugin.GetSectorSize(); diff --git a/DiscImageChef.Filesystems/HPFS.cs b/DiscImageChef.Filesystems/HPFS.cs index 22825d1c..c1f3cd72 100644 --- a/DiscImageChef.Filesystems/HPFS.cs +++ b/DiscImageChef.Filesystems/HPFS.cs @@ -90,12 +90,9 @@ namespace DiscImageChef.Filesystems StringBuilder sb = new StringBuilder(); - HPFS_BIOSParameterBlock hpfs_bpb = new HPFS_BIOSParameterBlock(); - HPFS_SuperBlock hpfs_sb = new HPFS_SuperBlock(); - HPFS_SpareBlock hpfs_sp = new HPFS_SpareBlock(); - - byte[] oem_name = new byte[8]; - byte[] volume_name = new byte[11]; + HPFS_BIOSParameterBlock hpfs_bpb; + HPFS_SuperBlock hpfs_sb; + HPFS_SpareBlock hpfs_sp; byte[] hpfs_bpb_sector = imagePlugin.ReadSector(0 + partition.Start); // Seek to BIOS parameter block, on logical sector 0 diff --git a/DiscImageChef.Filesystems/ISO9660/Info.cs b/DiscImageChef.Filesystems/ISO9660/Info.cs index ca568fc5..77745298 100644 --- a/DiscImageChef.Filesystems/ISO9660/Info.cs +++ b/DiscImageChef.Filesystems/ISO9660/Info.cs @@ -154,7 +154,6 @@ namespace DiscImageChef.Filesystems.ISO9660 { case 0: { - bvd = new BootRecord(); IntPtr ptr = Marshal.AllocHGlobal(2048); Marshal.Copy(vd_sector, hs_off, ptr, 2048 - hs_off); bvd = (BootRecord)Marshal.PtrToStructure(ptr, typeof(BootRecord)); @@ -165,7 +164,6 @@ namespace DiscImageChef.Filesystems.ISO9660 if(CurrentEncoding.GetString(bvd.Value.system_id).Substring(0, 23) == "EL TORITO SPECIFICATION") { BootSpec = "El Torito"; - torito = new ElToritoBootRecord(); ptr = Marshal.AllocHGlobal(2048); Marshal.Copy(vd_sector, hs_off, ptr, 2048 - hs_off); torito = (ElToritoBootRecord)Marshal.PtrToStructure(ptr, typeof(ElToritoBootRecord)); @@ -178,7 +176,6 @@ namespace DiscImageChef.Filesystems.ISO9660 { if(HighSierra) { - hsvd = new HighSierraPrimaryVolumeDescriptor(); IntPtr ptr = Marshal.AllocHGlobal(2048); Marshal.Copy(vd_sector, 0, ptr, 2048); hsvd = @@ -192,7 +189,6 @@ namespace DiscImageChef.Filesystems.ISO9660 .ByteArrayToStructureBigEndian(vd_sector); else { - pvd = new PrimaryVolumeDescriptor(); IntPtr ptr = Marshal.AllocHGlobal(2048); Marshal.Copy(vd_sector, 0, ptr, 2048); pvd = (PrimaryVolumeDescriptor)Marshal.PtrToStructure(ptr, typeof(PrimaryVolumeDescriptor)); @@ -202,7 +198,7 @@ namespace DiscImageChef.Filesystems.ISO9660 } case 2: { - PrimaryVolumeDescriptor svd = new PrimaryVolumeDescriptor(); + PrimaryVolumeDescriptor svd; IntPtr ptr = Marshal.AllocHGlobal(2048); Marshal.Copy(vd_sector, 0, ptr, 2048); svd = (PrimaryVolumeDescriptor)Marshal.PtrToStructure(ptr, typeof(PrimaryVolumeDescriptor)); @@ -565,7 +561,7 @@ namespace DiscImageChef.Filesystems.ISO9660 if(vd_sector[torito_off] != 1) goto exit_torito; - ElToritoValidationEntry valentry = new ElToritoValidationEntry(); + ElToritoValidationEntry valentry; IntPtr ptr = Marshal.AllocHGlobal(ElToritoEntrySize); Marshal.Copy(vd_sector, torito_off, ptr, ElToritoEntrySize); valentry = (ElToritoValidationEntry)Marshal.PtrToStructure(ptr, typeof(ElToritoValidationEntry)); @@ -575,7 +571,7 @@ namespace DiscImageChef.Filesystems.ISO9660 torito_off += ElToritoEntrySize; - ElToritoInitialEntry initial_entry = new ElToritoInitialEntry(); + ElToritoInitialEntry initial_entry; ptr = Marshal.AllocHGlobal(ElToritoEntrySize); Marshal.Copy(vd_sector, torito_off, ptr, ElToritoEntrySize); initial_entry = (ElToritoInitialEntry)Marshal.PtrToStructure(ptr, typeof(ElToritoInitialEntry)); @@ -637,7 +633,7 @@ namespace DiscImageChef.Filesystems.ISO9660 while(torito_off < vd_sector.Length && (vd_sector[torito_off] == (byte)ElToritoIndicator.Header || vd_sector[torito_off] == (byte)ElToritoIndicator.LastHeader)) { - ElToritoSectionHeaderEntry section_header = new ElToritoSectionHeaderEntry(); + ElToritoSectionHeaderEntry section_header; ptr = Marshal.AllocHGlobal(ElToritoEntrySize); Marshal.Copy(vd_sector, torito_off, ptr, ElToritoEntrySize); section_header = @@ -652,7 +648,7 @@ namespace DiscImageChef.Filesystems.ISO9660 for(int entry_counter = 1; entry_counter <= section_header.entries && torito_off < vd_sector.Length; entry_counter++) { - ElToritoSectionEntry section_entry = new ElToritoSectionEntry(); + ElToritoSectionEntry section_entry; ptr = Marshal.AllocHGlobal(ElToritoEntrySize); Marshal.Copy(vd_sector, torito_off, ptr, ElToritoEntrySize); section_entry = (ElToritoSectionEntry)Marshal.PtrToStructure(ptr, typeof(ElToritoSectionEntry)); @@ -716,7 +712,7 @@ namespace DiscImageChef.Filesystems.ISO9660 while(true && torito_off < vd_sector.Length) { - ElToritoSectionEntryExtension section_extension = new ElToritoSectionEntryExtension(); + ElToritoSectionEntryExtension section_extension; ptr = Marshal.AllocHGlobal(ElToritoEntrySize); Marshal.Copy(vd_sector, torito_off, ptr, ElToritoEntrySize); section_extension = diff --git a/DiscImageChef.Filesystems/LIF.cs b/DiscImageChef.Filesystems/LIF.cs index 4fa2ede1..dd9431c1 100644 --- a/DiscImageChef.Filesystems/LIF.cs +++ b/DiscImageChef.Filesystems/LIF.cs @@ -90,7 +90,7 @@ namespace DiscImageChef.Filesystems { if(imagePlugin.GetSectorSize() < 256) return false; - LIF_SystemBlock LIFSb = new LIF_SystemBlock(); + LIF_SystemBlock LIFSb; byte[] sector = imagePlugin.ReadSector(partition.Start); LIFSb = BigEndianMarshal.ByteArrayToStructureBigEndian(sector); @@ -106,7 +106,7 @@ namespace DiscImageChef.Filesystems if(imagePlugin.GetSectorSize() < 256) return; - LIF_SystemBlock LIFSb = new LIF_SystemBlock(); + LIF_SystemBlock LIFSb; byte[] sector = imagePlugin.ReadSector(partition.Start); LIFSb = BigEndianMarshal.ByteArrayToStructureBigEndian(sector); diff --git a/DiscImageChef.Filesystems/LisaFS/Dir.cs b/DiscImageChef.Filesystems/LisaFS/Dir.cs index 4d5c859e..c0e27f6a 100644 --- a/DiscImageChef.Filesystems/LisaFS/Dir.cs +++ b/DiscImageChef.Filesystems/LisaFS/Dir.cs @@ -113,6 +113,7 @@ namespace DiscImageChef.Filesystems.LisaFS { byte[] buf; error = ReadFile((short)FILEID_CATALOG, out buf); + if(error != Errno.NoError) return error; int offset = 0; List catalogV2 = new List(); @@ -296,7 +297,7 @@ namespace DiscImageChef.Filesystems.LisaFS stat = new FileEntryInfo(); stat.Attributes = new FileAttributes(); - DateTime tmp = new DateTime(); + DateTime tmp; directoryDTCCache.TryGetValue(dirId, out tmp); stat.CreationTime = tmp; diff --git a/DiscImageChef.Filesystems/MicroDOS.cs b/DiscImageChef.Filesystems/MicroDOS.cs index a1d3e1f3..a3943952 100644 --- a/DiscImageChef.Filesystems/MicroDOS.cs +++ b/DiscImageChef.Filesystems/MicroDOS.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.Filesystems if(imagePlugin.GetSectorSize() < 512) return false; - MicroDOSBlock0 block0 = new MicroDOSBlock0(); + MicroDOSBlock0 block0; byte[] bk0 = imagePlugin.ReadSector(0 + partition.Start); @@ -93,7 +93,7 @@ namespace DiscImageChef.Filesystems information = ""; StringBuilder sb = new StringBuilder(); - MicroDOSBlock0 block0 = new MicroDOSBlock0(); + MicroDOSBlock0 block0; byte[] bk0 = imagePlugin.ReadSector(0 + partition.Start); diff --git a/DiscImageChef.Filesystems/MinixFS.cs b/DiscImageChef.Filesystems/MinixFS.cs index ee499706..b8642e84 100644 --- a/DiscImageChef.Filesystems/MinixFS.cs +++ b/DiscImageChef.Filesystems/MinixFS.cs @@ -160,7 +160,7 @@ namespace DiscImageChef.Filesystems xmlFSType = new FileSystemType(); - bool littleEndian = true; + bool littleEndian; if(magic == MINIX3_MAGIC || magic == MINIX3_CIGAM || magic == MINIX2_MAGIC || magic == MINIX2_CIGAM || magic == MINIX_MAGIC || magic == MINIX_CIGAM) @@ -247,7 +247,7 @@ namespace DiscImageChef.Filesystems if(minix3) { - Minix3SuperBlock mnx_sb = new Minix3SuperBlock(); + Minix3SuperBlock mnx_sb; if(littleEndian) { @@ -285,7 +285,7 @@ namespace DiscImageChef.Filesystems } else { - MinixSuperBlock mnx_sb = new MinixSuperBlock(); + MinixSuperBlock mnx_sb; if(littleEndian) { diff --git a/DiscImageChef.Filesystems/NTFS.cs b/DiscImageChef.Filesystems/NTFS.cs index 98aa6470..5fc02e21 100644 --- a/DiscImageChef.Filesystems/NTFS.cs +++ b/DiscImageChef.Filesystems/NTFS.cs @@ -103,29 +103,27 @@ namespace DiscImageChef.Filesystems byte[] ntfs_bpb = imagePlugin.ReadSector(0 + partition.Start); - NTFS_BootBlock ntfs_bb = new NTFS_BootBlock(); + NTFS_BootBlock ntfs_bb; IntPtr bpbPtr = Marshal.AllocHGlobal(512); Marshal.Copy(ntfs_bpb, 0, bpbPtr, 512); ntfs_bb = (NTFS_BootBlock)Marshal.PtrToStructure(bpbPtr, typeof(NTFS_BootBlock)); Marshal.FreeHGlobal(bpbPtr); - byte[] oem_name = new byte[8]; - sb.AppendFormat("{0} bytes per sector", ntfs_bb.bps).AppendLine(); sb.AppendFormat("{0} sectors per cluster ({1} bytes)", ntfs_bb.spc, ntfs_bb.spc * ntfs_bb.bps).AppendLine(); - // sb.AppendFormat("{0} reserved sectors", ntfs_bb.rsectors).AppendLine(); - // sb.AppendFormat("{0} FATs", ntfs_bb.fats_no).AppendLine(); - // sb.AppendFormat("{0} entries in the root folder", ntfs_bb.root_ent).AppendLine(); - // sb.AppendFormat("{0} sectors on volume (small)", ntfs_bb.sml_sectors).AppendLine(); + // sb.AppendFormat("{0} reserved sectors", ntfs_bb.rsectors).AppendLine(); + // sb.AppendFormat("{0} FATs", ntfs_bb.fats_no).AppendLine(); + // sb.AppendFormat("{0} entries in the root folder", ntfs_bb.root_ent).AppendLine(); + // sb.AppendFormat("{0} sectors on volume (small)", ntfs_bb.sml_sectors).AppendLine(); sb.AppendFormat("Media descriptor: 0x{0:X2}", ntfs_bb.media).AppendLine(); - // sb.AppendFormat("{0} sectors per FAT", ntfs_bb.spfat).AppendLine(); + // sb.AppendFormat("{0} sectors per FAT", ntfs_bb.spfat).AppendLine(); sb.AppendFormat("{0} sectors per track", ntfs_bb.sptrk).AppendLine(); sb.AppendFormat("{0} heads", ntfs_bb.heads).AppendLine(); sb.AppendFormat("{0} hidden sectors before filesystem", ntfs_bb.hsectors).AppendLine(); - // sb.AppendFormat("{0} sectors on volume (big)", ntfs_bb.big_sectors).AppendLine(); + // sb.AppendFormat("{0} sectors on volume (big)", ntfs_bb.big_sectors).AppendLine(); sb.AppendFormat("BIOS drive number: 0x{0:X2}", ntfs_bb.drive_no).AppendLine(); - // sb.AppendFormat("NT flags: 0x{0:X2}", ntfs_bb.nt_flags).AppendLine(); - // sb.AppendFormat("Signature 1: 0x{0:X2}", ntfs_bb.signature1).AppendLine(); + // sb.AppendFormat("NT flags: 0x{0:X2}", ntfs_bb.nt_flags).AppendLine(); + // sb.AppendFormat("Signature 1: 0x{0:X2}", ntfs_bb.signature1).AppendLine(); sb.AppendFormat("{0} sectors on volume ({1} bytes)", ntfs_bb.sectors, ntfs_bb.sectors * ntfs_bb.bps) .AppendLine(); sb.AppendFormat("Cluster where $MFT starts: {0}", ntfs_bb.mft_lsn).AppendLine(); @@ -141,7 +139,7 @@ namespace DiscImageChef.Filesystems else sb.AppendFormat("{0} bytes per Index block", 1 << -ntfs_bb.index_blk_cts).AppendLine(); sb.AppendFormat("Volume serial number: {0:X16}", ntfs_bb.serial_no).AppendLine(); - // sb.AppendFormat("Signature 2: 0x{0:X4}", ntfs_bb.signature2).AppendLine(); + // sb.AppendFormat("Signature 2: 0x{0:X4}", ntfs_bb.signature2).AppendLine(); xmlFSType = new FileSystemType(); diff --git a/DiscImageChef.Filesystems/Nintendo.cs b/DiscImageChef.Filesystems/Nintendo.cs index 03f1edc4..076643dd 100644 --- a/DiscImageChef.Filesystems/Nintendo.cs +++ b/DiscImageChef.Filesystems/Nintendo.cs @@ -100,9 +100,10 @@ namespace DiscImageChef.Filesystems uint magicGC = BigEndianBitConverter.ToUInt32(header, 0x1C); uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18); - if(magicGC == 0xC2339F3D) wii = false; - else if(magicWii == 0x5D1C9EA3) wii = true; - else return; + if(magicWii == 0x5D1C9EA3) + wii = true; + else if(magicGC != 0xC2339F3D) + return; fields.discType = Encoding.ASCII.GetString(header, 0, 1); fields.gameCode = Encoding.ASCII.GetString(header, 1, 2); diff --git a/DiscImageChef.Filesystems/ODS.cs b/DiscImageChef.Filesystems/ODS.cs index 23339874..e87be1ea 100644 --- a/DiscImageChef.Filesystems/ODS.cs +++ b/DiscImageChef.Filesystems/ODS.cs @@ -115,8 +115,7 @@ namespace DiscImageChef.Filesystems information = ""; StringBuilder sb = new StringBuilder(); - ODSHomeBlock homeblock = new ODSHomeBlock(); - byte[] temp_string = new byte[12]; + ODSHomeBlock homeblock; homeblock.min_class = new byte[20]; homeblock.max_class = new byte[20]; diff --git a/DiscImageChef.Filesystems/PFS.cs b/DiscImageChef.Filesystems/PFS.cs index 4be59c5c..1fc67f16 100644 --- a/DiscImageChef.Filesystems/PFS.cs +++ b/DiscImageChef.Filesystems/PFS.cs @@ -205,7 +205,7 @@ namespace DiscImageChef.Filesystems out string information) { byte[] RootBlockSector = imagePlugin.ReadSector(2 + partition.Start); - RootBlock rootBlock = new RootBlock(); + RootBlock rootBlock; rootBlock = BigEndianMarshal.ByteArrayToStructureBigEndian(RootBlockSector); StringBuilder sbInformation = new StringBuilder(); diff --git a/DiscImageChef.Filesystems/QNX4.cs b/DiscImageChef.Filesystems/QNX4.cs index c9e39ad5..c7c45646 100644 --- a/DiscImageChef.Filesystems/QNX4.cs +++ b/DiscImageChef.Filesystems/QNX4.cs @@ -135,7 +135,7 @@ namespace DiscImageChef.Filesystems byte[] sector = imagePlugin.ReadSector(partition.Start + 1); if(sector.Length < 512) return false; - QNX4_Superblock qnxSb = new QNX4_Superblock(); + QNX4_Superblock qnxSb; IntPtr sbPtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, sbPtr, 512); qnxSb = (QNX4_Superblock)Marshal.PtrToStructure(sbPtr, typeof(QNX4_Superblock)); @@ -169,7 +169,7 @@ namespace DiscImageChef.Filesystems byte[] sector = imagePlugin.ReadSector(partition.Start + 1); if(sector.Length < 512) return; - QNX4_Superblock qnxSb = new QNX4_Superblock(); + QNX4_Superblock qnxSb; IntPtr sbPtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, sbPtr, 512); qnxSb = (QNX4_Superblock)Marshal.PtrToStructure(sbPtr, typeof(QNX4_Superblock)); diff --git a/DiscImageChef.Filesystems/RT11.cs b/DiscImageChef.Filesystems/RT11.cs index 3cd09b88..2fd374d6 100644 --- a/DiscImageChef.Filesystems/RT11.cs +++ b/DiscImageChef.Filesystems/RT11.cs @@ -89,7 +89,7 @@ namespace DiscImageChef.Filesystems information = ""; StringBuilder sb = new StringBuilder(); - RT11HomeBlock homeblock = new RT11HomeBlock(); + RT11HomeBlock homeblock; byte[] hb_sector = imagePlugin.ReadSector(1 + partition.Start); diff --git a/DiscImageChef.Filesystems/SFS.cs b/DiscImageChef.Filesystems/SFS.cs index 34e99437..e9bdfe79 100644 --- a/DiscImageChef.Filesystems/SFS.cs +++ b/DiscImageChef.Filesystems/SFS.cs @@ -121,7 +121,7 @@ namespace DiscImageChef.Filesystems out string information) { byte[] RootBlockSector = imagePlugin.ReadSector(partition.Start); - RootBlock rootBlock = new RootBlock(); + RootBlock rootBlock; rootBlock = BigEndianMarshal.ByteArrayToStructureBigEndian(RootBlockSector); StringBuilder sbInformation = new StringBuilder(); diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs index 863b17e2..64af6e14 100644 --- a/DiscImageChef.Filesystems/SysV.cs +++ b/DiscImageChef.Filesystems/SysV.cs @@ -203,7 +203,7 @@ namespace DiscImageChef.Filesystems uint s_fsize; bool xenix = false; bool sysv = false; - bool sysvr4 = false; + bool sysvr4; bool sys7th = false; bool coherent = false; bool xenix3 = false; @@ -500,8 +500,7 @@ namespace DiscImageChef.Filesystems sysv_sb.s_fsize = BigEndianBitConverter.ToUInt32(sb_sector, 0x002 + offset); - if(sysv_sb.s_fsize * bs > 0 && sysv_sb.s_fsize * bs == partition.Size) sysvr4 = false; - else sysvr4 = true; + sysvr4 = sysv_sb.s_fsize * bs <= 0 || sysv_sb.s_fsize * bs != partition.Size; if(sysvr4) { diff --git a/DiscImageChef.Filesystems/ZFS.cs b/DiscImageChef.Filesystems/ZFS.cs index 8d80ca38..f2ffd217 100644 --- a/DiscImageChef.Filesystems/ZFS.cs +++ b/DiscImageChef.Filesystems/ZFS.cs @@ -337,7 +337,7 @@ namespace DiscImageChef.Filesystems if(nvlist == null || nvlist.Length < 16) return false; - int offset = 0; + int offset; if(!xdr) return false; BigEndianBitConverter.IsLittleEndian = littleEndian; diff --git a/DiscImageChef.Filesystems/exFAT.cs b/DiscImageChef.Filesystems/exFAT.cs index 089b6b16..2e29934e 100644 --- a/DiscImageChef.Filesystems/exFAT.cs +++ b/DiscImageChef.Filesystems/exFAT.cs @@ -74,7 +74,7 @@ namespace DiscImageChef.Filesystems byte[] vbrSector = imagePlugin.ReadSector(0 + partition.Start); if(vbrSector.Length < 512) return false; - VolumeBootRecord vbr = new VolumeBootRecord(); + VolumeBootRecord vbr; IntPtr vbrPtr = Marshal.AllocHGlobal(512); Marshal.Copy(vbrSector, 0, vbrPtr, 512); vbr = (VolumeBootRecord)Marshal.PtrToStructure(vbrPtr, typeof(VolumeBootRecord)); @@ -91,21 +91,21 @@ namespace DiscImageChef.Filesystems xmlFSType = new FileSystemType(); byte[] vbrSector = imagePlugin.ReadSector(0 + partition.Start); - VolumeBootRecord vbr = new VolumeBootRecord(); + VolumeBootRecord vbr; IntPtr vbrPtr = Marshal.AllocHGlobal(512); Marshal.Copy(vbrSector, 0, vbrPtr, 512); vbr = (VolumeBootRecord)Marshal.PtrToStructure(vbrPtr, typeof(VolumeBootRecord)); Marshal.FreeHGlobal(vbrPtr); byte[] parametersSector = imagePlugin.ReadSector(9 + partition.Start); - OemParameterTable parametersTable = new OemParameterTable(); + OemParameterTable parametersTable; IntPtr parametersPtr = Marshal.AllocHGlobal(512); Marshal.Copy(parametersSector, 0, parametersPtr, 512); parametersTable = (OemParameterTable)Marshal.PtrToStructure(parametersPtr, typeof(OemParameterTable)); Marshal.FreeHGlobal(parametersPtr); byte[] chkSector = imagePlugin.ReadSector(11 + partition.Start); - ChecksumSector chksector = new ChecksumSector(); + ChecksumSector chksector; IntPtr chkPtr = Marshal.AllocHGlobal(512); Marshal.Copy(chkSector, 0, chkPtr, 512); chksector = (ChecksumSector)Marshal.PtrToStructure(chkPtr, typeof(ChecksumSector)); diff --git a/DiscImageChef.Filesystems/ext2FS.cs b/DiscImageChef.Filesystems/ext2FS.cs index 1bd44c7c..c85102e4 100644 --- a/DiscImageChef.Filesystems/ext2FS.cs +++ b/DiscImageChef.Filesystems/ext2FS.cs @@ -98,14 +98,10 @@ namespace DiscImageChef.Filesystems StringBuilder sb = new StringBuilder(); ext2FSSuperBlock supblk = new ext2FSSuperBlock(); - byte[] forstrings; bool new_ext2 = false; bool ext3 = false; bool ext4 = false; - byte[] guid_a = new byte[16]; - byte[] guid_b = new byte[16]; - int sb_size_in_bytes = Marshal.SizeOf(typeof(ext2FSSuperBlock)); uint sb_size_in_sectors = (uint)(sb_size_in_bytes / imagePlugin.GetSectorSize()); if(sb_size_in_bytes % imagePlugin.GetSectorSize() > 0) sb_size_in_sectors++; diff --git a/DiscImageChef.Partitions/Acorn.cs b/DiscImageChef.Partitions/Acorn.cs index e2628ad7..e5ec04e5 100644 --- a/DiscImageChef.Partitions/Acorn.cs +++ b/DiscImageChef.Partitions/Acorn.cs @@ -72,7 +72,7 @@ namespace DiscImageChef.Partitions if(sector.Length < 512) return false; - AcornBootBlock bootBlock = new AcornBootBlock(); + AcornBootBlock bootBlock; IntPtr bbPtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, bbPtr, 512); bootBlock = (AcornBootBlock)Marshal.PtrToStructure(bbPtr, typeof(AcornBootBlock)); @@ -112,7 +112,7 @@ namespace DiscImageChef.Partitions switch(bootBlock.flags & TYPE_MASK) { case TYPE_LINUX: { - LinuxTable table = new LinuxTable(); + LinuxTable table; IntPtr tablePtr = Marshal.AllocHGlobal(512); Marshal.Copy(map, 0, tablePtr, 512); table = (LinuxTable)Marshal.PtrToStructure(tablePtr, typeof(LinuxTable)); @@ -140,7 +140,7 @@ namespace DiscImageChef.Partitions case TYPE_RISCIX_MFM: case TYPE_RISCIX_SCSI: { - RiscIxTable table = new RiscIxTable(); + RiscIxTable table; IntPtr tablePtr = Marshal.AllocHGlobal(512); Marshal.Copy(map, 0, tablePtr, 512); table = (RiscIxTable)Marshal.PtrToStructure(tablePtr, typeof(RiscIxTable)); diff --git a/DiscImageChef.Partitions/Apricot.cs b/DiscImageChef.Partitions/Apricot.cs index 104988ab..f6789567 100644 --- a/DiscImageChef.Partitions/Apricot.cs +++ b/DiscImageChef.Partitions/Apricot.cs @@ -73,7 +73,7 @@ namespace DiscImageChef.Partitions if(sector.Length < 512) return false; - ApricotLabel label = new ApricotLabel(); + ApricotLabel label; IntPtr lblPtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, lblPtr, 512); label = (ApricotLabel)Marshal.PtrToStructure(lblPtr, typeof(ApricotLabel)); diff --git a/DiscImageChef.Partitions/DEC.cs b/DiscImageChef.Partitions/DEC.cs index d9120a9c..ec44a6b5 100644 --- a/DiscImageChef.Partitions/DEC.cs +++ b/DiscImageChef.Partitions/DEC.cs @@ -59,7 +59,7 @@ namespace DiscImageChef.Partitions byte[] sector = imagePlugin.ReadSector(31 + sectorOffset); if(sector.Length < 512) return false; - DECLabel table = new DECLabel(); + DECLabel table; IntPtr tablePtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, tablePtr, 512); table = (DECLabel)Marshal.PtrToStructure(tablePtr, typeof(DECLabel)); diff --git a/DiscImageChef.Partitions/DragonFlyBSD.cs b/DiscImageChef.Partitions/DragonFlyBSD.cs index 9a1ef630..e8ddaf7a 100644 --- a/DiscImageChef.Partitions/DragonFlyBSD.cs +++ b/DiscImageChef.Partitions/DragonFlyBSD.cs @@ -59,7 +59,7 @@ namespace DiscImageChef.Partitions byte[] sectors = imagePlugin.ReadSectors(sectorOffset, nSectors); if(sectors.Length < 2048) return false; - Disklabel64 disklabel = new Disklabel64(); + Disklabel64 disklabel; IntPtr labelPtr = Marshal.AllocHGlobal(2048); Marshal.Copy(sectors, 0, labelPtr, 2048); disklabel = (Disklabel64)Marshal.PtrToStructure(labelPtr, typeof(Disklabel64)); diff --git a/DiscImageChef.Partitions/Human68k.cs b/DiscImageChef.Partitions/Human68k.cs index a61b1eea..14894760 100644 --- a/DiscImageChef.Partitions/Human68k.cs +++ b/DiscImageChef.Partitions/Human68k.cs @@ -55,7 +55,7 @@ namespace DiscImageChef.Partitions partitions = new List(); byte[] sector; - ulong sectsPerUnit = 0; + ulong sectsPerUnit; DicConsole.DebugWriteLine("Human68k plugin", "sectorSize = {0}", imagePlugin.GetSectorSize()); diff --git a/DiscImageChef.Partitions/PC98.cs b/DiscImageChef.Partitions/PC98.cs index f9e17074..2d5c751d 100644 --- a/DiscImageChef.Partitions/PC98.cs +++ b/DiscImageChef.Partitions/PC98.cs @@ -61,7 +61,7 @@ namespace DiscImageChef.Partitions byte[] sector = imagePlugin.ReadSector(1); if(bootSector[bootSector.Length - 2] != 0x55 || bootSector[bootSector.Length - 1] != 0xAA) return false; - PC98Table table = new PC98Table(); + PC98Table table; IntPtr tablePtr = Marshal.AllocHGlobal(256); Marshal.Copy(sector, 0, tablePtr, 256); table = (PC98Table)Marshal.PtrToStructure(tablePtr, typeof(PC98Table)); diff --git a/DiscImageChef.Partitions/RioKarma.cs b/DiscImageChef.Partitions/RioKarma.cs index 4f43c7a6..5ebb346a 100644 --- a/DiscImageChef.Partitions/RioKarma.cs +++ b/DiscImageChef.Partitions/RioKarma.cs @@ -57,7 +57,7 @@ namespace DiscImageChef.Partitions byte[] sector = imagePlugin.ReadSector(sectorOffset); if(sector.Length < 512) return false; - RioKarmaTable table = new RioKarmaTable(); + RioKarmaTable table; IntPtr tablePtr = Marshal.AllocHGlobal(512); Marshal.Copy(sector, 0, tablePtr, 512); table = (RioKarmaTable)Marshal.PtrToStructure(tablePtr, typeof(RioKarmaTable)); diff --git a/DiscImageChef.Partitions/UNIX.cs b/DiscImageChef.Partitions/UNIX.cs index c1ec4811..720e8058 100644 --- a/DiscImageChef.Partitions/UNIX.cs +++ b/DiscImageChef.Partitions/UNIX.cs @@ -52,7 +52,7 @@ namespace DiscImageChef.Partitions public override bool GetInformation(ImagePlugin imagePlugin, out List partitions, ulong sectorOffset) { partitions = new List(); - Partition[] parts = new Partition[0]; + Partition[] parts; if(sectorOffset != 0) return false; diff --git a/DiscImageChef.Partitions/VTOC.cs b/DiscImageChef.Partitions/VTOC.cs index c22b9a1b..bd964dba 100644 --- a/DiscImageChef.Partitions/VTOC.cs +++ b/DiscImageChef.Partitions/VTOC.cs @@ -149,7 +149,6 @@ namespace DiscImageChef.Partitions if(magic == VTOC_SANE || magic == VTOC_ENAS) { magic_found = true; - useOld = false; DicConsole.DebugWriteLine("VTOC plugin", "New VTOC found at {0}", pdloc + sectorOffset + 1); if(magic == VTOC_SANE) { @@ -225,7 +224,6 @@ namespace DiscImageChef.Partitions if(magic == VTOC_SANE || magic == VTOC_ENAS) { magic_found = true; - useOld = false; DicConsole.DebugWriteLine("VTOC plugin", "New VTOC found."); if(magic == VTOC_SANE) { diff --git a/DiscImageChef.Partitions/Xbox.cs b/DiscImageChef.Partitions/Xbox.cs index a8bd539e..0175e345 100644 --- a/DiscImageChef.Partitions/Xbox.cs +++ b/DiscImageChef.Partitions/Xbox.cs @@ -122,7 +122,7 @@ namespace DiscImageChef.Partitions return true; } - uint temp = 0; + uint temp; if(imagePlugin.ImageInfo.Sectors > (ulong)(MemoryUnitDataOff / imagePlugin.ImageInfo.SectorSize)) { diff --git a/DiscImageChef.Server/Statistics.aspx.cs b/DiscImageChef.Server/Statistics.aspx.cs index 888031aa..984fbca7 100644 --- a/DiscImageChef.Server/Statistics.aspx.cs +++ b/DiscImageChef.Server/Statistics.aspx.cs @@ -227,7 +227,7 @@ namespace DiscImageChef.Server devices = new List(); foreach(DeviceStats device in statistics.Devices) { - string url = null; + string url; string xmlFile; if(!string.IsNullOrWhiteSpace(device.Manufacturer) && !string.IsNullOrWhiteSpace(device.Model) && !string.IsNullOrWhiteSpace(device.Revision)) diff --git a/DiscImageChef.Server/ViewReport.aspx.cs b/DiscImageChef.Server/ViewReport.aspx.cs index b648c5d5..832c4585 100644 --- a/DiscImageChef.Server/ViewReport.aspx.cs +++ b/DiscImageChef.Server/ViewReport.aspx.cs @@ -102,8 +102,8 @@ namespace DiscImageChef.Server if(report.USB != null) { - string usbVendorDescription = null; - string usbProductDescription = null; + string usbVendorDescription; + string usbProductDescription; GetUsbDescriptions(report.USB.VendorID, report.USB.ProductID, out usbVendorDescription, out usbProductDescription); @@ -544,7 +544,7 @@ namespace DiscImageChef.Server TestedMedia.Report(testedMedia, ata, ref mediaOneValue); if(mediaOneValue.Count > 0) { - sscMedia = true; + divTestedMedia.Visible = true; repTestedMedia.DataSource = mediaOneValue; repTestedMedia.DataBind(); } diff --git a/DiscImageChef.Tests.Devices/ATA/Smart.cs b/DiscImageChef.Tests.Devices/ATA/Smart.cs index ee2b0157..198001f1 100644 --- a/DiscImageChef.Tests.Devices/ATA/Smart.cs +++ b/DiscImageChef.Tests.Devices/ATA/Smart.cs @@ -457,8 +457,6 @@ namespace DiscImageChef.Tests.Devices.ATA DicConsole.WriteLine("Returning to S.M.A.R.T. commands menu..."); return; case 1: - DicConsole.Write("What logical block address?: "); - strDev = System.Console.ReadLine(); DicConsole.Write("Log address?: "); strDev = System.Console.ReadLine(); if(!byte.TryParse(strDev, out address)) diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs index 401471b4..3f287068 100644 --- a/DiscImageChef/Commands/Analyze.cs +++ b/DiscImageChef/Commands/Analyze.cs @@ -72,7 +72,6 @@ namespace DiscImageChef.Commands catch(ArgumentException) { DicConsole.ErrorWriteLine("Specified encoding is not supported."); - encoding = null; return; } diff --git a/DiscImageChef/Commands/Configure.cs b/DiscImageChef/Commands/Configure.cs index f001ca52..b001d38e 100644 --- a/DiscImageChef/Commands/Configure.cs +++ b/DiscImageChef/Commands/Configure.cs @@ -42,7 +42,6 @@ namespace DiscImageChef.Commands { ConsoleKeyInfo pressedKey = new ConsoleKeyInfo(); - pressedKey = new ConsoleKeyInfo(); while(pressedKey.Key != ConsoleKey.Y && pressedKey.Key != ConsoleKey.N) { DicConsole.Write("Do you want to save device reports globally? (Y/N): "); diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index 7f843a5d..f74eeba7 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -67,7 +67,6 @@ namespace DiscImageChef.Commands catch(ArgumentException) { DicConsole.ErrorWriteLine("Specified encoding is not supported."); - encoding = null; return; } diff --git a/DiscImageChef/Commands/Decode.cs b/DiscImageChef/Commands/Decode.cs index be625f27..27b250ba 100644 --- a/DiscImageChef/Commands/Decode.cs +++ b/DiscImageChef/Commands/Decode.cs @@ -254,6 +254,8 @@ namespace DiscImageChef.Commands tag); break; } + + // TODO: Not implemented } Core.Statistics.AddCommand("decode"); diff --git a/DiscImageChef/Commands/DumpMedia.cs b/DiscImageChef/Commands/DumpMedia.cs index 266fe164..eec29cfd 100644 --- a/DiscImageChef/Commands/DumpMedia.cs +++ b/DiscImageChef/Commands/DumpMedia.cs @@ -71,7 +71,6 @@ namespace DiscImageChef.Commands catch(ArgumentException) { DicConsole.ErrorWriteLine("Specified encoding is not supported."); - encoding = null; return; } diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index f311e0fd..5d4ca707 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -74,7 +74,6 @@ namespace DiscImageChef.Commands catch(ArgumentException) { DicConsole.ErrorWriteLine("Specified encoding is not supported."); - encoding = null; return; } diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs index fb3a655e..ec063923 100644 --- a/DiscImageChef/Commands/Ls.cs +++ b/DiscImageChef/Commands/Ls.cs @@ -70,7 +70,6 @@ namespace DiscImageChef.Commands catch(ArgumentException) { DicConsole.ErrorWriteLine("Specified encoding is not supported."); - encoding = null; return; } diff --git a/DiscImageChef/Commands/MediaScan.cs b/DiscImageChef/Commands/MediaScan.cs index 9f49e62b..9a6ede31 100644 --- a/DiscImageChef/Commands/MediaScan.cs +++ b/DiscImageChef/Commands/MediaScan.cs @@ -60,7 +60,7 @@ namespace DiscImageChef.Commands Core.Statistics.AddDevice(dev); - ScanResults results = new ScanResults(); + ScanResults results; switch(dev.Type) {