From 770066e53f9d1f531dd56c3b086d894c0490bd6f Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 17 Aug 2021 16:47:47 +0100 Subject: [PATCH] Remove unused code --- Aaru.CommonTypes | 2 +- Aaru.Devices/Windows/Command.cs | 20 ------------ Aaru.Filesystems/CPM/CPM.cs | 1 - Aaru.Filesystems/CPM/Super.cs | 5 --- Aaru.Filesystems/LisaFS/Dir.cs | 7 ++--- Aaru.Filesystems/UNIXBFS.cs | 1 + Aaru.Filters/OffsetStream.cs | 6 ---- Aaru.Filters/SplitJoinStream.cs | 11 ------- Aaru.Images/Aaru.Images.csproj | 1 - Aaru.Images/AaruFormat/Verify.cs | 10 ------ Aaru.Images/Alcohol120/Read.cs | 2 +- Aaru.Images/Alcohol120/Verify.cs | 7 ----- Aaru.Images/AppleNIB/Helpers.cs | 49 ------------------------------ Aaru.Images/BlindWrite4/Verify.cs | 7 ----- Aaru.Images/BlindWrite5/Verify.cs | 7 ----- Aaru.Images/CDRDAO/Helpers.cs | 16 ---------- Aaru.Images/CDRDAO/Verify.cs | 7 ----- Aaru.Images/CDRWin/Verify.cs | 7 ----- Aaru.Images/CHD/Verify.cs | 8 ----- Aaru.Images/CloneCD/Helpers.cs | 3 -- Aaru.Images/CloneCD/Verify.cs | 7 ----- Aaru.Images/DiscJuggler/Verify.cs | 7 ----- Aaru.Images/DiskDupe/DiskDupe.cs | 6 ---- Aaru.Images/DiskDupe/Properties.cs | 6 ---- Aaru.Images/GDI/Verify.cs | 7 ----- Aaru.Images/Nero/Verify.cs | 7 ----- Aaru.Images/VHD/Read.cs | 3 -- Aaru.Images/VHDX/Helpers.cs | 7 ----- Aaru.Images/ZZZRawImage/Verify.cs | 10 ------ 29 files changed, 5 insertions(+), 232 deletions(-) delete mode 100644 Aaru.Images/AppleNIB/Helpers.cs diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 488a9c12c..9e9af262b 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 488a9c12cb68c908996cf782d3c399f5dfa46cb4 +Subproject commit 9e9af262bd069dc62c811d0a11f921c90cd025e2 diff --git a/Aaru.Devices/Windows/Command.cs b/Aaru.Devices/Windows/Command.cs index 59abc9cbd..d76055657 100644 --- a/Aaru.Devices/Windows/Command.cs +++ b/Aaru.Devices/Windows/Command.cs @@ -456,26 +456,6 @@ namespace Aaru.Devices.Windows return error; } - /// Gets the device number for a specified handle - /// Device handle - /// Device number - static uint GetDeviceNumber(SafeFileHandle deviceHandle) - { - var sdn = new StorageDeviceNumber - { - deviceNumber = -1 - }; - - uint k = 0; - - if(!Extern.DeviceIoControlGetDeviceNumber(deviceHandle, WindowsIoctl.IoctlStorageGetDeviceNumber, - IntPtr.Zero, 0, ref sdn, (uint)Marshal.SizeOf(sdn), ref k, - IntPtr.Zero)) - return uint.MaxValue; - - return (uint)sdn.deviceNumber; - } - /// Returns true if the specified handle is controlled by a SFFDISK (aka SDHCI) driver /// Device handle /// true if SDHCI, false otherwise diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs index 1e0642641..6d069cc2f 100644 --- a/Aaru.Filesystems/CPM/CPM.cs +++ b/Aaru.Filesystems/CPM/CPM.cs @@ -50,7 +50,6 @@ namespace Aaru.Filesystems /// Cached FileSystemInfo _cpmStat; - bool _debug; /// Cached file passwords, decoded Dictionary _decodedPasswordCache; diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs index 2fff62ef9..21de2cabf 100644 --- a/Aaru.Filesystems/CPM/Super.cs +++ b/Aaru.Filesystems/CPM/Super.cs @@ -57,11 +57,6 @@ namespace Aaru.Filesystems _device = imagePlugin; Encoding = encoding ?? Encoding.GetEncoding("IBM437"); - options ??= GetDefaultOptions(); - - if(options.TryGetValue("debug", out string debugString)) - bool.TryParse(debugString, out _debug); - // As the identification is so complex, just call Identify() and relay on its findings if(!Identify(_device, partition) || !_cpmFound || diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs index 39e97da4c..f31499c61 100644 --- a/Aaru.Filesystems/LisaFS/Dir.cs +++ b/Aaru.Filesystems/LisaFS/Dir.cs @@ -87,16 +87,13 @@ namespace Aaru.Filesystems.LisaFS return Errno.NoError; } - Errno ReadDir(short dirId, out List contents) - { + void ReadDir(short dirId, out List contents) => + // Do same trick as Mac OS X, replace filesystem '/' with '-', // as '-' is the path separator in Lisa OS contents = (from entry in _catalogCache where entry.parentID == dirId select StringHandlers.CToString(entry.filename, Encoding).Replace('/', '-')).ToList(); - return Errno.NoError; - } - /// Reads, interprets and caches the Catalog File Errno ReadCatalog() { diff --git a/Aaru.Filesystems/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS.cs index 6304eb9bb..0a16a81af 100644 --- a/Aaru.Filesystems/UNIXBFS.cs +++ b/Aaru.Filesystems/UNIXBFS.cs @@ -31,6 +31,7 @@ // ****************************************************************************/ using System; +using System.Diagnostics.CodeAnalysis; using System.Text; using Aaru.CommonTypes; using Aaru.CommonTypes.Interfaces; diff --git a/Aaru.Filters/OffsetStream.cs b/Aaru.Filters/OffsetStream.cs index 6cddb784f..aaf4e0d1a 100644 --- a/Aaru.Filters/OffsetStream.cs +++ b/Aaru.Filters/OffsetStream.cs @@ -549,12 +549,6 @@ namespace Aaru.Filters /// public override void Close() => _baseStream.Close(); - new void Dispose() - { - _baseStream.Dispose(); - base.Dispose(); - } - /// public override int EndRead(IAsyncResult asyncResult) => _baseStream.EndRead(asyncResult); diff --git a/Aaru.Filters/SplitJoinStream.cs b/Aaru.Filters/SplitJoinStream.cs index 6dc8b53e8..e428b7283 100644 --- a/Aaru.Filters/SplitJoinStream.cs +++ b/Aaru.Filters/SplitJoinStream.cs @@ -263,17 +263,6 @@ namespace Aaru.Filters _position = 0; } - new void Dispose() - { - foreach(Stream stream in _baseStreams.Values) - stream.Dispose(); - - _baseStreams.Clear(); - _position = 0; - - base.Dispose(); - } - /// public override int EndRead(IAsyncResult asyncResult) => throw new NotSupportedException("Asynchronous I/O is not supported."); diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj index 52d1d1f90..37d2ad5ee 100644 --- a/Aaru.Images/Aaru.Images.csproj +++ b/Aaru.Images/Aaru.Images.csproj @@ -103,7 +103,6 @@ - diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs index d8975fb4c..4a40c8448 100644 --- a/Aaru.Images/AaruFormat/Verify.cs +++ b/Aaru.Images/AaruFormat/Verify.cs @@ -308,15 +308,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc) - return null; - - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 912640ade..85d9f33f8 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -369,7 +369,7 @@ namespace Aaru.DiscImages if(!_alcTracks.TryGetValue(alcSes.lastTrack, out Track endingTrack)) break; - if(!_alcTrackExtras.TryGetValue(alcSes.firstTrack, out TrackExtra startingTrackExtra)) + if(!_alcTrackExtras.TryGetValue(alcSes.firstTrack, out _)) break; if(!_alcTrackExtras.TryGetValue(alcSes.lastTrack, out TrackExtra endingTrackExtra)) diff --git a/Aaru.Images/Alcohol120/Verify.cs b/Aaru.Images/Alcohol120/Verify.cs index 6f218ad31..1ca633518 100644 --- a/Aaru.Images/Alcohol120/Verify.cs +++ b/Aaru.Images/Alcohol120/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/AppleNIB/Helpers.cs b/Aaru.Images/AppleNIB/Helpers.cs deleted file mode 100644 index 595f77616..000000000 --- a/Aaru.Images/AppleNIB/Helpers.cs +++ /dev/null @@ -1,49 +0,0 @@ -// /*************************************************************************** -// Aaru Data Preservation Suite -// ---------------------------------------------------------------------------- -// -// Filename : Helpers.cs -// Author(s) : Natalia Portillo -// -// Component : Disk image plugins. -// -// --[ Description ] ---------------------------------------------------------- -// -// Contains helpers for Apple nibbelized disk images. -// -// --[ License ] -------------------------------------------------------------- -// -// This library is free software; you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation; either version 2.1 of the -// License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, see . -// -// ---------------------------------------------------------------------------- -// Copyright © 2011-2021 Natalia Portillo -// ****************************************************************************/ - -using Aaru.CommonTypes; - -namespace Aaru.DiscImages -{ - public sealed partial class AppleNib - { - MediaType GetMediaType() - { - switch(_imageInfo.Sectors) - { - case 455: return MediaType.Apple32SS; - case 560: return MediaType.Apple33SS; - default: return MediaType.Unknown; - } - } - } -} \ No newline at end of file diff --git a/Aaru.Images/BlindWrite4/Verify.cs b/Aaru.Images/BlindWrite4/Verify.cs index e6c9d8838..1dd091a12 100644 --- a/Aaru.Images/BlindWrite4/Verify.cs +++ b/Aaru.Images/BlindWrite4/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/BlindWrite5/Verify.cs b/Aaru.Images/BlindWrite5/Verify.cs index 1972a3f47..712361d54 100644 --- a/Aaru.Images/BlindWrite5/Verify.cs +++ b/Aaru.Images/BlindWrite5/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/CDRDAO/Helpers.cs b/Aaru.Images/CDRDAO/Helpers.cs index 28edcd682..92933ae9b 100644 --- a/Aaru.Images/CDRDAO/Helpers.cs +++ b/Aaru.Images/CDRDAO/Helpers.cs @@ -37,22 +37,6 @@ namespace Aaru.DiscImages { public sealed partial class Cdrdao { - static ushort CdrdaoTrackTypeToBytesPerSector(string trackType) - { - switch(trackType) - { - case CDRDAO_TRACK_TYPE_MODE1: - case CDRDAO_TRACK_TYPE_MODE2_FORM1: return 2048; - case CDRDAO_TRACK_TYPE_MODE2_FORM2: return 2324; - case CDRDAO_TRACK_TYPE_MODE2: - case CDRDAO_TRACK_TYPE_MODE2_MIX: return 2336; - case CDRDAO_TRACK_TYPE_AUDIO: - case CDRDAO_TRACK_TYPE_MODE1_RAW: - case CDRDAO_TRACK_TYPE_MODE2_RAW: return 2352; - default: return 0; - } - } - static ushort CdrdaoTrackTypeToCookedBytesPerSector(string trackType) { switch(trackType) diff --git a/Aaru.Images/CDRDAO/Verify.cs b/Aaru.Images/CDRDAO/Verify.cs index 570f27172..304d7f2b1 100644 --- a/Aaru.Images/CDRDAO/Verify.cs +++ b/Aaru.Images/CDRDAO/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/CDRWin/Verify.cs b/Aaru.Images/CDRWin/Verify.cs index 2ba73bd8a..f954a5d78 100644 --- a/Aaru.Images/CDRWin/Verify.cs +++ b/Aaru.Images/CDRWin/Verify.cs @@ -224,12 +224,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/CHD/Verify.cs b/Aaru.Images/CHD/Verify.cs index 0904d151d..e5b68a186 100644 --- a/Aaru.Images/CHD/Verify.cs +++ b/Aaru.Images/CHD/Verify.cs @@ -153,13 +153,5 @@ namespace Aaru.DiscImages return _expectedChecksum.SequenceEqual(calculated); } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - if(_isHdd) - throw new FeaturedNotSupportedByDiscImageException("Cannot access optical tracks on a hard disk image"); - - return VerifySector(GetAbsoluteSector(sectorAddress, track)); - } } } \ No newline at end of file diff --git a/Aaru.Images/CloneCD/Helpers.cs b/Aaru.Images/CloneCD/Helpers.cs index 90aa77859..3912c7990 100644 --- a/Aaru.Images/CloneCD/Helpers.cs +++ b/Aaru.Images/CloneCD/Helpers.cs @@ -39,8 +39,5 @@ namespace Aaru.DiscImages static long MsfToLba((byte minute, byte second, byte frame) msf) => (msf.minute * 60 * 75) + (msf.second * 75) + msf.frame - 150; - - static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) => - ((byte)((sector + 150) / 75 / 60), (byte)((sector + 150) / 75 % 60), (byte)((sector + 150) % 75)); } } \ No newline at end of file diff --git a/Aaru.Images/CloneCD/Verify.cs b/Aaru.Images/CloneCD/Verify.cs index 04242db95..0c3d18246 100644 --- a/Aaru.Images/CloneCD/Verify.cs +++ b/Aaru.Images/CloneCD/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/DiscJuggler/Verify.cs b/Aaru.Images/DiscJuggler/Verify.cs index afbe8293e..e6d0413d0 100644 --- a/Aaru.Images/DiscJuggler/Verify.cs +++ b/Aaru.Images/DiscJuggler/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/DiskDupe/DiskDupe.cs b/Aaru.Images/DiskDupe/DiskDupe.cs index 7e19da4fe..8b9874166 100644 --- a/Aaru.Images/DiskDupe/DiskDupe.cs +++ b/Aaru.Images/DiskDupe/DiskDupe.cs @@ -70,12 +70,6 @@ namespace Aaru.DiscImages /// public sealed partial class DiskDupe : IMediaImage { - /// Every track that has been read is cached here - readonly Dictionary _trackCache = new Dictionary(); - - /// The offset in the file where each track starts, or -1 if the track is not present - readonly Dictionary _trackOffset = new Dictionary(); - /// The DDI file header after the image has been opened FileHeader _fileHeader; diff --git a/Aaru.Images/DiskDupe/Properties.cs b/Aaru.Images/DiskDupe/Properties.cs index 10028adf8..e6664d934 100644 --- a/Aaru.Images/DiskDupe/Properties.cs +++ b/Aaru.Images/DiskDupe/Properties.cs @@ -42,12 +42,6 @@ namespace Aaru.DiscImages { public sealed partial class DiskDupe { - public List Partitions => - throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public List Tracks => - throw new FeatureUnsupportedImageException("Feature not supported by image format"); - public List Sessions => - throw new FeatureUnsupportedImageException("Feature not supported by image format"); /// public string Name => "DiskDupe DDI Disk Image"; /// diff --git a/Aaru.Images/GDI/Verify.cs b/Aaru.Images/GDI/Verify.cs index c527b3e38..8477b3af3 100644 --- a/Aaru.Images/GDI/Verify.cs +++ b/Aaru.Images/GDI/Verify.cs @@ -113,12 +113,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file diff --git a/Aaru.Images/Nero/Verify.cs b/Aaru.Images/Nero/Verify.cs index cefedf830..fcbc7acfb 100644 --- a/Aaru.Images/Nero/Verify.cs +++ b/Aaru.Images/Nero/Verify.cs @@ -46,13 +46,6 @@ namespace Aaru.DiscImages return CdChecksums.CheckCdSector(buffer); } - public bool? VerifySector(ulong sectorAddress, uint track) - { - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } - /// public bool? VerifySectors(ulong sectorAddress, uint length, out List failingLbas, out List unknownLbas) diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs index 00b24dc2d..c61b82ff7 100644 --- a/Aaru.Images/VHD/Read.cs +++ b/Aaru.Images/VHD/Read.cs @@ -464,9 +464,6 @@ namespace Aaru.DiscImages _blockAllocationTable = new uint[_thisDynamic.MaxTableEntries]; - // How many sectors uses the BAT - int batSectorCount = (int)Math.Ceiling((double)_thisDynamic.MaxTableEntries * 4 / 512); - byte[] bat = new byte[_thisDynamic.MaxTableEntries * 4]; imageStream.Seek((long)_thisDynamic.TableOffset, SeekOrigin.Begin); imageStream.Read(bat, 0, bat.Length); diff --git a/Aaru.Images/VHDX/Helpers.cs b/Aaru.Images/VHDX/Helpers.cs index a34af865d..b150e0322 100644 --- a/Aaru.Images/VHDX/Helpers.cs +++ b/Aaru.Images/VHDX/Helpers.cs @@ -48,12 +48,5 @@ namespace Aaru.DiscImages return (_sectorBitmap[index] & val) == val; } - - static uint VhdxChecksum(IEnumerable data) - { - uint checksum = data.Aggregate(0, (current, b) => current + b); - - return ~checksum; - } } } \ No newline at end of file diff --git a/Aaru.Images/ZZZRawImage/Verify.cs b/Aaru.Images/ZZZRawImage/Verify.cs index 5cac5b7c8..402f8521a 100644 --- a/Aaru.Images/ZZZRawImage/Verify.cs +++ b/Aaru.Images/ZZZRawImage/Verify.cs @@ -139,15 +139,5 @@ namespace Aaru.DiscImages return failingLbas.Count <= 0; } - - public bool? VerifySector(ulong sectorAddress, uint track) - { - if(!_rawCompactDisc) - return null; - - byte[] buffer = ReadSectorLong(sectorAddress, track); - - return CdChecksums.CheckCdSector(buffer); - } } } \ No newline at end of file