From ff2afc4593257a8d6f2f75c857c1dd743c689704 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 20 Dec 2017 17:46:47 +0000 Subject: [PATCH] REFACTOR: Use explicit or implicit modified definition. --- DiscImageChef.Checksums/SpamSumContext.cs | 2 +- .../Devices/Dumping/CompactDisc.cs | 2 +- DiscImageChef.Core/Devices/Dumping/MMC.cs | 2 +- DiscImageChef.Core/Devices/Dumping/SBC.cs | 2 +- DiscImageChef.Core/Devices/Dumping/SSC.cs | 2 +- DiscImageChef.Core/Devices/Dumping/XGD.cs | 2 +- DiscImageChef.Core/Devices/Report/SCSI/MMC.cs | 2 +- DiscImageChef.Core/Devices/Report/SCSI/SSC.cs | 2 +- DiscImageChef.Devices/FreeBSD/Structs.cs | 22 +++++++++---------- DiscImageChef.Devices/Windows/Structs.cs | 2 +- DiscImageChef.Devices/Windows/UsbFunctions.cs | 2 +- DiscImageChef.DiscImages/DiskCopy42.cs | 2 +- DiscImageChef.DiscImages/HDCopy.cs | 10 ++++----- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/DiscImageChef.Checksums/SpamSumContext.cs b/DiscImageChef.Checksums/SpamSumContext.cs index ad4d6c8da..905364e0f 100644 --- a/DiscImageChef.Checksums/SpamSumContext.cs +++ b/DiscImageChef.Checksums/SpamSumContext.cs @@ -482,7 +482,7 @@ namespace DiscImageChef.Checksums } // Converts an ASCII null-terminated string to .NET string - private string CToString(byte[] cString) + string CToString(byte[] cString) { StringBuilder sb = new StringBuilder(); diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index dbdc7fe04..99ef867f7 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -49,7 +49,7 @@ namespace DiscImageChef.Core.Devices.Dumping using Session = Decoders.CD.Session; using TrackType = Schemas.TrackType; - internal class CompactDisc + class CompactDisc { internal static void Dump(Device dev, string devicePath, string outputPrefix, ushort retryPasses, bool force, bool dumpRaw, bool persistent, bool stopOnError, ref CICMMetadataType sidecar, diff --git a/DiscImageChef.Core/Devices/Dumping/MMC.cs b/DiscImageChef.Core/Devices/Dumping/MMC.cs index 29272b855..f75e8e10a 100644 --- a/DiscImageChef.Core/Devices/Dumping/MMC.cs +++ b/DiscImageChef.Core/Devices/Dumping/MMC.cs @@ -40,7 +40,7 @@ using Schemas; namespace DiscImageChef.Core.Devices.Dumping { - internal static class Mmc + static class Mmc { internal static void Dump(Device dev, string devicePath, string outputPrefix, ushort retryPasses, bool force, bool dumpRaw, bool persistent, bool stopOnError, ref CICMMetadataType sidecar, diff --git a/DiscImageChef.Core/Devices/Dumping/SBC.cs b/DiscImageChef.Core/Devices/Dumping/SBC.cs index 2259c2dda..fd60f7396 100644 --- a/DiscImageChef.Core/Devices/Dumping/SBC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SBC.cs @@ -49,7 +49,7 @@ namespace DiscImageChef.Core.Devices.Dumping { using TrackType = DiscImages.TrackType; - internal static class Sbc + static class Sbc { internal static void Dump(Device dev, string devicePath, string outputPrefix, ushort retryPasses, bool force, bool dumpRaw, bool persistent, bool stopOnError, ref CICMMetadataType sidecar, diff --git a/DiscImageChef.Core/Devices/Dumping/SSC.cs b/DiscImageChef.Core/Devices/Dumping/SSC.cs index c90257cf7..4d597bd22 100644 --- a/DiscImageChef.Core/Devices/Dumping/SSC.cs +++ b/DiscImageChef.Core/Devices/Dumping/SSC.cs @@ -42,7 +42,7 @@ using Schemas; namespace DiscImageChef.Core.Devices.Dumping { - internal static class Ssc + static class Ssc { internal static void Dump(Device dev, string outputPrefix, string devicePath, ref CICMMetadataType sidecar, ref Metadata.Resume resume, ref DumpLog dumpLog) diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index d7ebb3667..7a38ec07e 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -47,7 +47,7 @@ using Schemas; namespace DiscImageChef.Core.Devices.Dumping { - internal static class Xgd + static class Xgd { internal static void Dump(Device dev, string devicePath, string outputPrefix, ushort retryPasses, bool force, bool dumpRaw, bool persistent, bool stopOnError, ref CICMMetadataType sidecar, diff --git a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs index f32aefe5a..85df27ee8 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/MMC.cs @@ -39,7 +39,7 @@ using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report.SCSI { - internal static class Mmc + static class Mmc { internal static void Report(Device dev, ref DeviceReport report, bool debug, ref Decoders.SCSI.Modes.ModePage_2A? cdromMode, ref List mediaTypes) diff --git a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs index a7957b94c..a49c51971 100644 --- a/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs +++ b/DiscImageChef.Core/Devices/Report/SCSI/SSC.cs @@ -38,7 +38,7 @@ using DiscImageChef.Metadata; namespace DiscImageChef.Core.Devices.Report.SCSI { - internal static class Ssc + static class Ssc { internal static void Report(Device dev, ref DeviceReport report, bool debug) { diff --git a/DiscImageChef.Devices/FreeBSD/Structs.cs b/DiscImageChef.Devices/FreeBSD/Structs.cs index c0fe8fa02..dccc077bc 100644 --- a/DiscImageChef.Devices/FreeBSD/Structs.cs +++ b/DiscImageChef.Devices/FreeBSD/Structs.cs @@ -301,7 +301,7 @@ namespace DiscImageChef.Devices.FreeBSD [StructLayout(LayoutKind.Sequential)] struct NvmeCommand { - private ushort opc_fuse_rsvd1; + ushort opc_fuse_rsvd1; /// /// command identifier /// @@ -372,7 +372,7 @@ namespace DiscImageChef.Devices.FreeBSD [StructLayout(LayoutKind.Sequential)] struct NvmeStatus { - private ushort status; + ushort status; /// /// phase tag @@ -462,7 +462,7 @@ namespace DiscImageChef.Devices.FreeBSD [StructLayout(LayoutKind.Sequential)] struct PeriphMatchPattern { - private const int DEV_IDLEN = 16; + const int DEV_IDLEN = 16; [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN)] public byte[] periph_name; public uint unit_number; @@ -482,9 +482,9 @@ namespace DiscImageChef.Devices.FreeBSD [StructLayout(LayoutKind.Sequential)] struct ScsiStaticInquiryPattern { - private const int SID_VENDOR_SIZE = 8; - private const int SID_PRODUCT_SIZE = 16; - private const int SID_REVISION_SIZE = 4; + const int SID_VENDOR_SIZE = 8; + const int SID_PRODUCT_SIZE = 16; + const int SID_REVISION_SIZE = 4; public byte type; public byte media_type; [MarshalAs(UnmanagedType.ByValArray, SizeConst = SID_VENDOR_SIZE + 1)] public byte[] vendor; @@ -512,7 +512,7 @@ namespace DiscImageChef.Devices.FreeBSD [StructLayout(LayoutKind.Sequential)] struct BusMatchPattern { - private const int DEV_IDLEN = 16; + const int DEV_IDLEN = 16; public path_id_t path_id; [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN)] public byte[] dev_name; @@ -622,7 +622,7 @@ namespace DiscImageChef.Devices.FreeBSD struct BusMatchResult { public path_id_t path_id; - private const int DEV_IDLEN = 16; + const int DEV_IDLEN = 16; [MarshalAs(UnmanagedType.ByValArray, SizeConst = DEV_IDLEN)] public byte[] dev_name; public uint unit_number; public uint bus_id; @@ -687,9 +687,9 @@ namespace DiscImageChef.Devices.FreeBSD struct CamDevice { - private const int MAXPATHLEN = 1024; - private const int DEV_IDLEN = 16; - private const int SIM_IDLEN = 16; + const int MAXPATHLEN = 1024; + const int DEV_IDLEN = 16; + const int SIM_IDLEN = 16; /// /// Pathname of the device given by the user. This may be null if the user states the device name and unit number separately. /// diff --git a/DiscImageChef.Devices/Windows/Structs.cs b/DiscImageChef.Devices/Windows/Structs.cs index e64ac0841..8c672e9ce 100644 --- a/DiscImageChef.Devices/Windows/Structs.cs +++ b/DiscImageChef.Devices/Windows/Structs.cs @@ -215,7 +215,7 @@ namespace DiscImageChef.Devices.Windows public int cbSize; public Guid interfaceClassGuid; public uint flags; - private IntPtr reserved; + IntPtr reserved; } [StructLayout(LayoutKind.Sequential)] diff --git a/DiscImageChef.Devices/Windows/UsbFunctions.cs b/DiscImageChef.Devices/Windows/UsbFunctions.cs index 39f93c9ac..c0b6f0090 100644 --- a/DiscImageChef.Devices/Windows/UsbFunctions.cs +++ b/DiscImageChef.Devices/Windows/UsbFunctions.cs @@ -291,7 +291,7 @@ namespace DiscImageChef.Devices.Windows } // return a unique device number for the given device path - private static int GetDeviceNumber(string devicePath) + static int GetDeviceNumber(string devicePath) { int ans = -1; diff --git a/DiscImageChef.DiscImages/DiskCopy42.cs b/DiscImageChef.DiscImages/DiskCopy42.cs index 9476286d1..3f98f9944 100644 --- a/DiscImageChef.DiscImages/DiskCopy42.cs +++ b/DiscImageChef.DiscImages/DiskCopy42.cs @@ -933,7 +933,7 @@ namespace DiscImageChef.DiscImages #endregion Unsupported features #region Private methods - private static uint DC42CheckSum(byte[] buffer) + static uint DC42CheckSum(byte[] buffer) { uint dc42Chk = 0; if((buffer.Length & 0x01) == 0x01) return 0xFFFFFFFF; diff --git a/DiscImageChef.DiscImages/HDCopy.cs b/DiscImageChef.DiscImages/HDCopy.cs index 8ebbfa871..96d9033b3 100644 --- a/DiscImageChef.DiscImages/HDCopy.cs +++ b/DiscImageChef.DiscImages/HDCopy.cs @@ -137,17 +137,17 @@ namespace DiscImageChef.DiscImages /// /// The HDCP file header after the image has been opened /// - private HdcpFileHeader fileHeader; + HdcpFileHeader fileHeader; /// /// Every track that has been read is cached here /// - private Dictionary trackCache = new Dictionary(); + Dictionary trackCache = new Dictionary(); /// /// The offset in the file where each track starts, or -1 if the track is not present /// - private Dictionary trackOffset = new Dictionary(); + Dictionary trackOffset = new Dictionary(); /// /// The ImageFilter we're reading from, after the file has been opened @@ -156,7 +156,7 @@ namespace DiscImageChef.DiscImages #endregion #region Internal constants - private readonly MediaTypeTableEntry[] mediaTypes = + readonly MediaTypeTableEntry[] mediaTypes = { new MediaTypeTableEntry(80, 8, MediaType.DOS_35_DS_DD_8), new MediaTypeTableEntry(80, 9, MediaType.DOS_35_DS_DD_9), @@ -382,7 +382,7 @@ namespace DiscImageChef.DiscImages return MediaType.Unknown; } - private void ReadTrackIntoCache(Stream stream, int tracknum) + void ReadTrackIntoCache(Stream stream, int tracknum) { byte[] trackData = new byte[ImageInfo.SectorSize * ImageInfo.SectorsPerTrack]; byte[] blkHeader = new byte[3];