From 6129e52d4144cee7ea582b27b3cb76ba1e010f86 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 28 Jul 2016 23:08:22 +0100 Subject: [PATCH] Code re-styling. --- DiscImageChef.Checksums/ChangeLog | 5 +++++ DiscImageChef.Checksums/DiscImageChef.Checksums.csproj | 2 ++ DiscImageChef.Checksums/SpamSumContext.cs | 2 +- DiscImageChef.CommonTypes/ChangeLog | 5 +++++ DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj | 2 ++ DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs | 2 ++ DiscImageChef.Console/ChangeLog | 4 ++++ DiscImageChef.Console/DiscImageChef.Console.csproj | 2 ++ DiscImageChef.Decoders/ChangeLog | 7 +++++++ DiscImageChef.Decoders/DiscImageChef.Decoders.csproj | 2 ++ DiscImageChef.Decoders/SCSI/Modes.cs | 4 ++-- DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs | 2 +- DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs | 4 ++-- DiscImageChef.Devices/ChangeLog | 4 ++++ DiscImageChef.Devices/DiscImageChef.Devices.csproj | 2 ++ DiscImageChef.DiscImages/ChangeLog | 5 +++++ DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj | 2 ++ DiscImageChef.DiscImages/DiskCopy42.cs | 2 +- DiscImageChef.Filesystems/ChangeLog | 7 +++++++ DiscImageChef.Filesystems/LisaFS/Dir.cs | 2 +- DiscImageChef.Filesystems/LisaFS/Encoding.cs | 2 +- DiscImageChef.Filesystems/LisaFS/Extent.cs | 2 +- DiscImageChef.Filesystems/LisaFS/File.cs | 4 ++-- DiscImageChef.Helpers/ChangeLog | 4 ++++ DiscImageChef.Helpers/DiscImageChef.Helpers.csproj | 2 ++ DiscImageChef.Interop/ChangeLog | 4 ++++ DiscImageChef.Interop/DiscImageChef.Interop.csproj | 2 ++ DiscImageChef.Metadata/ChangeLog | 5 +++++ DiscImageChef.Metadata/Dimensions.cs | 2 +- DiscImageChef.Metadata/DiscImageChef.Metadata.csproj | 2 ++ DiscImageChef.Partitions/ChangeLog | 4 ++++ DiscImageChef.Partitions/DiscImageChef.Partitions.csproj | 2 ++ DiscImageChef.Settings/ChangeLog | 4 ++++ DiscImageChef.Settings/DiscImageChef.Settings.csproj | 2 ++ 34 files changed, 95 insertions(+), 13 deletions(-) diff --git a/DiscImageChef.Checksums/ChangeLog b/DiscImageChef.Checksums/ChangeLog index d824fff64..9626104ee 100644 --- a/DiscImageChef.Checksums/ChangeLog +++ b/DiscImageChef.Checksums/ChangeLog @@ -1,3 +1,8 @@ +2016-07-28 Natalia Portillo + + * SpamSumContext.cs: + * DiscImageChef.Checksums.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * CDChecksums.cs: diff --git a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj index 638d5db97..d98af89d9 100644 --- a/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj +++ b/DiscImageChef.Checksums/DiscImageChef.Checksums.csproj @@ -73,6 +73,8 @@ + + diff --git a/DiscImageChef.Checksums/SpamSumContext.cs b/DiscImageChef.Checksums/SpamSumContext.cs index facda0ceb..1f968b856 100644 --- a/DiscImageChef.Checksums/SpamSumContext.cs +++ b/DiscImageChef.Checksums/SpamSumContext.cs @@ -219,7 +219,7 @@ namespace DiscImageChef.Checksums void fuzzy_engine_step(byte c) { - ulong h; + ulong h; uint i; /* At each character we update the rolling hash and the normal hashes. * When the rolling hash hits a reset value then we emit a normal hash diff --git a/DiscImageChef.CommonTypes/ChangeLog b/DiscImageChef.CommonTypes/ChangeLog index ec4e69701..0264f3a2d 100644 --- a/DiscImageChef.CommonTypes/ChangeLog +++ b/DiscImageChef.CommonTypes/ChangeLog @@ -1,3 +1,8 @@ +2016-07-28 Natalia Portillo + + * MediaTypeFromSCSI.cs: + * DiscImageChef.CommonTypes.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * MediaType.cs: diff --git a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj index 6432a13f2..c3f733cb3 100644 --- a/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj +++ b/DiscImageChef.CommonTypes/DiscImageChef.CommonTypes.csproj @@ -49,6 +49,8 @@ + + diff --git a/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs b/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs index 03d9fb2b5..fe5e76711 100644 --- a/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs +++ b/DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs @@ -32,6 +32,7 @@ namespace DiscImageChef.CommonTypes { +#pragma warning disable RECS0063 // Warns when a culture-aware 'StartsWith' call is used by default. public static class MediaTypeFromSCSI { public static MediaType Get(byte scsiPeripheralType, string vendor, string model, byte mediumType, byte densityCode, ulong blocks, uint blockSize) @@ -1612,4 +1613,5 @@ namespace DiscImageChef.CommonTypes return MediaType.Unknown; } } +#pragma warning restore RECS0063 // Warns when a culture-aware 'StartsWith' call is used by default. } \ No newline at end of file diff --git a/DiscImageChef.Console/ChangeLog b/DiscImageChef.Console/ChangeLog index f7f032fcc..2d248862e 100644 --- a/DiscImageChef.Console/ChangeLog +++ b/DiscImageChef.Console/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Console.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * DicConsole.cs: Refactor and code cleanup. diff --git a/DiscImageChef.Console/DiscImageChef.Console.csproj b/DiscImageChef.Console/DiscImageChef.Console.csproj index 934cbee76..67018bc5d 100644 --- a/DiscImageChef.Console/DiscImageChef.Console.csproj +++ b/DiscImageChef.Console/DiscImageChef.Console.csproj @@ -47,6 +47,8 @@ + + diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index 4bb3b6e5b..d3639ca71 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,10 @@ +2016-07-28 Natalia Portillo + + * Modes.cs: + * BlockLimits.cs: + * DensitySupport.cs: + * DiscImageChef.Decoders.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * PMA.cs: diff --git a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj index d95cfe8d4..87b9970cf 100644 --- a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj +++ b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj @@ -125,6 +125,8 @@ + + diff --git a/DiscImageChef.Decoders/SCSI/Modes.cs b/DiscImageChef.Decoders/SCSI/Modes.cs index 80efbf32e..cad23cf72 100644 --- a/DiscImageChef.Decoders/SCSI/Modes.cs +++ b/DiscImageChef.Decoders/SCSI/Modes.cs @@ -1810,7 +1810,7 @@ namespace DiscImageChef.Decoders.SCSI break; } - #endregion Multimedia device mode header + #endregion Multimedia device mode header } return sb.ToString(); @@ -2380,7 +2380,7 @@ namespace DiscImageChef.Decoders.SCSI if(page.FirstBurstSize > 0) sb.AppendFormat("\t{0} bytes maximum can be transferred for a command along with the disconnect command", page.FirstBurstSize * 512).AppendLine(); - if(page.DIMM) + if(page.DIMM) sb.AppendLine("\tTarget shall not transfer data for a command during the same interconnect tenancy"); if(page.EMDP) sb.AppendLine("\tTarget is allowed to re-order the data transfer"); diff --git a/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs b/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs index 075be429e..e4d612527 100644 --- a/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs +++ b/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs @@ -89,7 +89,7 @@ namespace DiscImageChef.Decoders.SCSI.SSC if(decoded.Value.granularity > 0) #pragma warning disable IDE0004 // Remove Unnecessary Cast - sb.AppendFormat("Device's needs a block size granularity of 2^{0} ({1}) bytes", decoded.Value.granularity, Math.Pow(2, (double)decoded.Value.granularity)).AppendLine(); + sb.AppendFormat("Device's needs a block size granularity of 2^{0} ({1}) bytes", decoded.Value.granularity, Math.Pow(2, (double)decoded.Value.granularity)).AppendLine(); #pragma warning restore IDE0004 // Remove Unnecessary Cast } diff --git a/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs b/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs index f4ab771bd..380a68abe 100644 --- a/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs +++ b/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs @@ -169,7 +169,7 @@ namespace DiscImageChef.Decoders.SCSI.SSC #pragma warning disable IDE0004 // Remove Unnecessary Cast descriptor.bpmm, descriptor.tracks, (double)((double)descriptor.width / (double)10)).AppendLine(); #pragma warning restore IDE0004 // Remove Unnecessary Cast - sb.AppendFormat("\tDensity maximum capacity is {0} megabytes", descriptor.capacity).AppendLine(); + sb.AppendFormat("\tDensity maximum capacity is {0} megabytes", descriptor.capacity).AppendLine(); sb.AppendFormat("\tDensity description: {0}", descriptor.description).AppendLine(); sb.AppendLine(); } @@ -261,7 +261,7 @@ namespace DiscImageChef.Decoders.SCSI.SSC #pragma warning disable IDE0004 // Remove Unnecessary Cast descriptor.length, (double)((double)descriptor.width / (double)10)).AppendLine(); #pragma warning restore IDE0004 // Remove Unnecessary Cast - sb.AppendFormat("\tMedium description: {0}", descriptor.description).AppendLine(); + sb.AppendFormat("\tMedium description: {0}", descriptor.description).AppendLine(); sb.AppendLine(); } diff --git a/DiscImageChef.Devices/ChangeLog b/DiscImageChef.Devices/ChangeLog index 96423165a..6abd1af41 100644 --- a/DiscImageChef.Devices/ChangeLog +++ b/DiscImageChef.Devices/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Devices.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * Command.cs: diff --git a/DiscImageChef.Devices/DiscImageChef.Devices.csproj b/DiscImageChef.Devices/DiscImageChef.Devices.csproj index e28119137..e97824092 100644 --- a/DiscImageChef.Devices/DiscImageChef.Devices.csproj +++ b/DiscImageChef.Devices/DiscImageChef.Devices.csproj @@ -92,6 +92,8 @@ + + diff --git a/DiscImageChef.DiscImages/ChangeLog b/DiscImageChef.DiscImages/ChangeLog index 4fae713f3..25ce50fb9 100644 --- a/DiscImageChef.DiscImages/ChangeLog +++ b/DiscImageChef.DiscImages/ChangeLog @@ -1,3 +1,8 @@ +2016-07-28 Natalia Portillo + + * DiskCopy42.cs: + * DiscImageChef.DiscImages.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * VHD.cs: diff --git a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj index 9c3b9e325..71f02468f 100644 --- a/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj +++ b/DiscImageChef.DiscImages/DiscImageChef.DiscImages.csproj @@ -75,6 +75,8 @@ + + diff --git a/DiscImageChef.DiscImages/DiskCopy42.cs b/DiscImageChef.DiscImages/DiskCopy42.cs index bd891989d..086a05d89 100644 --- a/DiscImageChef.DiscImages/DiskCopy42.cs +++ b/DiscImageChef.DiscImages/DiskCopy42.cs @@ -200,7 +200,7 @@ namespace DiscImageChef.ImagePlugins return false; if(tmp_header.format != kSonyFormat400K && tmp_header.format != kSonyFormat800K && tmp_header.format != kSonyFormat720K && - tmp_header.format != kSonyFormat1440K && tmp_header.format != kSonyFormat1680K && tmp_header.format != kSigmaFormatTwiggy && + tmp_header.format != kSonyFormat1440K && tmp_header.format != kSonyFormat1680K && tmp_header.format != kSigmaFormatTwiggy && tmp_header.format != kNotStandardFormat) { DicConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.format = 0x{0:X2} value", tmp_header.format); diff --git a/DiscImageChef.Filesystems/ChangeLog b/DiscImageChef.Filesystems/ChangeLog index f3b9e52fd..ba6271e82 100644 --- a/DiscImageChef.Filesystems/ChangeLog +++ b/DiscImageChef.Filesystems/ChangeLog @@ -1,3 +1,10 @@ +2016-07-28 Natalia Portillo + + * Dir.cs: + * File.cs: + * Extent.cs: + * Encoding.cs: Code re-styling. + 2016-07-28 Natalia Portillo * ODS.cs: diff --git a/DiscImageChef.Filesystems/LisaFS/Dir.cs b/DiscImageChef.Filesystems/LisaFS/Dir.cs index a0fb5a92b..62145c15f 100644 --- a/DiscImageChef.Filesystems/LisaFS/Dir.cs +++ b/DiscImageChef.Filesystems/LisaFS/Dir.cs @@ -59,7 +59,7 @@ namespace DiscImageChef.Filesystems.LisaFS ReadCatalog(fileId, out catalog); foreach(CatalogEntry entry in catalog) - contents.Add(GetString(entry.filename).Replace('/',':')); + contents.Add(GetString(entry.filename).Replace('/', ':')); if(debug && fileId == FILEID_DIRECTORY) { diff --git a/DiscImageChef.Filesystems/LisaFS/Encoding.cs b/DiscImageChef.Filesystems/LisaFS/Encoding.cs index ede61d052..2bba46b7b 100644 --- a/DiscImageChef.Filesystems/LisaFS/Encoding.cs +++ b/DiscImageChef.Filesystems/LisaFS/Encoding.cs @@ -118,7 +118,7 @@ namespace DiscImageChef.Filesystems.LisaFS { if(b == 0x00) break; - + uni += LisaRomanTable[b]; } diff --git a/DiscImageChef.Filesystems/LisaFS/Extent.cs b/DiscImageChef.Filesystems/LisaFS/Extent.cs index 0a35d550e..fc80c0835 100644 --- a/DiscImageChef.Filesystems/LisaFS/Extent.cs +++ b/DiscImageChef.Filesystems/LisaFS/Extent.cs @@ -166,7 +166,7 @@ namespace DiscImageChef.Filesystems.LisaFS file.unknown9 = BigEndianBitConverter.ToInt32(sector, 0x84); extentsOffset = 0x88; } - + for(int j = 0; j < 41; j++) { if(BigEndianBitConverter.ToInt16(sector, extentsOffset + j * 6 + 4) == 0) diff --git a/DiscImageChef.Filesystems/LisaFS/File.cs b/DiscImageChef.Filesystems/LisaFS/File.cs index b374d9689..1306de783 100644 --- a/DiscImageChef.Filesystems/LisaFS/File.cs +++ b/DiscImageChef.Filesystems/LisaFS/File.cs @@ -192,7 +192,7 @@ namespace DiscImageChef.Filesystems.LisaFS } if(systemFileCache.TryGetValue(fileId, out buf) && !tags) - return Errno.NoError; + return Errno.NoError; int count = 0; @@ -254,7 +254,7 @@ namespace DiscImageChef.Filesystems.LisaFS if(!tags) systemFileCache.Add(fileId, buf); - + return Errno.NoError; } diff --git a/DiscImageChef.Helpers/ChangeLog b/DiscImageChef.Helpers/ChangeLog index 4bce39523..b6f498cfe 100644 --- a/DiscImageChef.Helpers/ChangeLog +++ b/DiscImageChef.Helpers/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Helpers.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * Swapping.cs: diff --git a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj index 70461eef6..0c87f71b7 100644 --- a/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj +++ b/DiscImageChef.Helpers/DiscImageChef.Helpers.csproj @@ -60,6 +60,8 @@ + + diff --git a/DiscImageChef.Interop/ChangeLog b/DiscImageChef.Interop/ChangeLog index 0c91911bf..3223e325c 100644 --- a/DiscImageChef.Interop/ChangeLog +++ b/DiscImageChef.Interop/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Interop.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * DetectOS.cs: Refactor and code cleanup. diff --git a/DiscImageChef.Interop/DiscImageChef.Interop.csproj b/DiscImageChef.Interop/DiscImageChef.Interop.csproj index 44bf9c589..093355f86 100644 --- a/DiscImageChef.Interop/DiscImageChef.Interop.csproj +++ b/DiscImageChef.Interop/DiscImageChef.Interop.csproj @@ -48,6 +48,8 @@ + + diff --git a/DiscImageChef.Metadata/ChangeLog b/DiscImageChef.Metadata/ChangeLog index 4a0253e69..d94994ff8 100644 --- a/DiscImageChef.Metadata/ChangeLog +++ b/DiscImageChef.Metadata/ChangeLog @@ -1,3 +1,8 @@ +2016-07-28 Natalia Portillo + + * Dimensions.cs: + * DiscImageChef.Metadata.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * DeviceReport.cs: Refactor and code cleanup. diff --git a/DiscImageChef.Metadata/Dimensions.cs b/DiscImageChef.Metadata/Dimensions.cs index b0654a937..693b113e4 100644 --- a/DiscImageChef.Metadata/Dimensions.cs +++ b/DiscImageChef.Metadata/Dimensions.cs @@ -888,7 +888,7 @@ namespace DiscImageChef.Metadata #endregion CD/DVD/BD #region Apple Hard Disks - // TODO: Find Apple Widget size + // TODO: Find Apple Widget size case CommonTypes.MediaType.AppleProfile: dmns.Height = 223.8; dmns.HeightSpecified = true; diff --git a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj index 0772eb001..ea1a2e3b3 100644 --- a/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj +++ b/DiscImageChef.Metadata/DiscImageChef.Metadata.csproj @@ -63,6 +63,8 @@ + + diff --git a/DiscImageChef.Partitions/ChangeLog b/DiscImageChef.Partitions/ChangeLog index 4418a4a3e..6e7e9a1be 100644 --- a/DiscImageChef.Partitions/ChangeLog +++ b/DiscImageChef.Partitions/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Partitions.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * GPT.cs: diff --git a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj index 9d0227427..8f23d6206 100644 --- a/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj +++ b/DiscImageChef.Partitions/DiscImageChef.Partitions.csproj @@ -76,6 +76,8 @@ + + diff --git a/DiscImageChef.Settings/ChangeLog b/DiscImageChef.Settings/ChangeLog index 16f758214..56a3db7fa 100644 --- a/DiscImageChef.Settings/ChangeLog +++ b/DiscImageChef.Settings/ChangeLog @@ -1,3 +1,7 @@ +2016-07-28 Natalia Portillo + + * DiscImageChef.Settings.csproj: Code re-styling. + 2016-07-28 Natalia Portillo * Settings.cs: Refactor and code cleanup. diff --git a/DiscImageChef.Settings/DiscImageChef.Settings.csproj b/DiscImageChef.Settings/DiscImageChef.Settings.csproj index 84d798fbb..85d5cf1bf 100644 --- a/DiscImageChef.Settings/DiscImageChef.Settings.csproj +++ b/DiscImageChef.Settings/DiscImageChef.Settings.csproj @@ -97,6 +97,8 @@ + +