Code cleanup

DiscUtils/Block.cs

@@ -27,7 +27,7 @@ namespace DiscUtils
         public Block()
         {
         }
-        
+
         public long Position { get; set; }
 
         public byte[] Data { get; set; }

DiscUtils/BlockCache.cs

@@ -22,9 +22,7 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
-    using System.Text;
 
     internal class BlockCache<T>
         where T : Block, new()

DiscUtils/BootConfig/DiscUtilsRegistryStorage.cs

@@ -22,10 +22,10 @@
 
 namespace DiscUtils.BootConfig
 {
+    using DiscUtils.Registry;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
-    using DiscUtils.Registry;
 
     internal class DiscUtilsRegistryStorage : BaseStorage
     {

DiscUtils/BootConfig/ElementValue.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.BootConfig
 {
     using System;
-    using System.Globalization;
 
     /// <summary>
     /// The value of an element.

DiscUtils/BootConfig/InheritType.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.BootConfig
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Indicates the type of objects that can inherit from an object.
     /// </summary>

DiscUtils/BootConfig/Store.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.BootConfig
 {
+    using DiscUtils.Registry;
     using System;
     using System.Collections.Generic;
-    using DiscUtils.Registry;
 
     /// <summary>
     /// Represents a Boot Configuration Database store (i.e. a BCD file).

DiscUtils/BuilderSparseStreamExtent.cs

@@ -22,9 +22,7 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
-    using System.Text;
 
     internal class BuilderSparseStreamExtent : BuilderExtent
     {

DiscUtils/ClusterMap.cs

@@ -24,7 +24,6 @@ namespace DiscUtils
 {
     using System;
     using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Enumeration of possible cluster roles.
@@ -36,12 +35,12 @@ namespace DiscUtils
         /// <summary>
         /// Unknown, or unspecified role.
         /// </summary>
-        None     = 0x00,
+        None = 0x00,
 
         /// <summary>
         /// Cluster is free.
         /// </summary>
-        Free     = 0x01,
+        Free = 0x01,
 
         /// <summary>
         /// Cluster is in use by a normal file.
@@ -69,7 +68,7 @@ namespace DiscUtils
         /// <summary>
         /// Cluster is marked bad.
         /// </summary>
-        Bad      = 0x20,
+        Bad = 0x20,
     }
 
     /// <summary>

DiscUtils/Fat/DirectoryEntry.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Fat
 {
     using System;
     using System.IO;
-    using System.Text;
 
     internal class DirectoryEntry
     {

DiscUtils/Fat/FileAllocationTable.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Fat
 {
-    using System;
     using System.IO;
 
     internal class FileAllocationTable

DiscUtils/Fat/FileSystemFactory.cs

@@ -22,8 +22,8 @@
 
 namespace DiscUtils.Fat
 {
-    using System.IO;
     using DiscUtils.Vfs;
+    using System.IO;
 
     [VfsFileSystemFactory]
     internal class FileSystemFactory : VfsFileSystemFactory

DiscUtils/LogicalDiskManager/DynamicDisk.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System;
     using System.IO;
-    using DiscUtils.Partitions;
 
     internal class DynamicDisk : IDiagnosticTraceable
     {

DiscUtils/LogicalDiskManager/DynamicDiskGroup.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     internal class DynamicDiskGroup : IDiagnosticTraceable
     {

DiscUtils/LogicalDiskManager/DynamicDiskManager.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
+    using DiscUtils.Partitions;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// A class that understands Windows LDM structures, mapping physical volumes to logical volumes.

DiscUtils/LogicalDiskManager/TocBlock.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils.LogicalDiskManager
 {
-    using System;
-
     internal class TocBlock
     {
         public string Signature; // TOCBLOCK

DiscUtils/MappedStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
 

DiscUtils/Ntfs/AttributeDefinitionRecord.cs

@@ -27,25 +27,25 @@ namespace DiscUtils.Ntfs
 
     internal enum AttributeCollationRule : int
     {
-        Binary                = 0x00000000,
-        Filename              = 0x00000001,
-        UnicodeString         = 0x00000002,
-        UnsignedLong          = 0x00000010,
-        Sid                   = 0x00000011,
-        SecurityHash          = 0x00000012,
+        Binary = 0x00000000,
+        Filename = 0x00000001,
+        UnicodeString = 0x00000002,
+        UnsignedLong = 0x00000010,
+        Sid = 0x00000011,
+        SecurityHash = 0x00000012,
         MultipleUnsignedLongs = 0x00000013
     }
 
     [Flags]
     internal enum AttributeTypeFlags : int
     {
-        None             = 0x00,
-        Indexed          = 0x02,
-        Multiple         = 0x04,
-        NotZero          = 0x08,
-        IndexedUnique    = 0x10,
-        NamedUnique      = 0x20,
-        MustBeResident   = 0x40,
+        None = 0x00,
+        Indexed = 0x02,
+        Multiple = 0x04,
+        NotZero = 0x08,
+        IndexedUnique = 0x10,
+        NamedUnique = 0x20,
+        MustBeResident = 0x40,
         CanBeNonResident = 0x80
     }
 

DiscUtils/Ntfs/CompressedClusterStream.cs

@@ -22,10 +22,10 @@
 
 namespace DiscUtils.Ntfs
 {
+    using DiscUtils.Compression;
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Compression;
 
     internal sealed class CompressedClusterStream : ClusterStream
     {

DiscUtils/Ntfs/CookedDataRun.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
 
     internal class CookedDataRun
     {

DiscUtils/Ntfs/DataRun.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System.Globalization;
-    using System.IO;
 
     internal class DataRun
     {

DiscUtils/Ntfs/File.cs

@@ -809,7 +809,7 @@ namespace DiscUtils.Ntfs
 
             return SplitAttribute(record, (NonResidentAttributeRecord)record.FirstAttribute, false);
         }
-        
+
         private bool SplitAttribute(FileRecord record, NonResidentAttributeRecord targetAttr, bool atStart)
         {
             if (targetAttr.DataRuns.Count <= 1)

DiscUtils/Ntfs/FileRecord.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Ntfs
 {
     using System;
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
     using System.IO;
 
     [Flags]

DiscUtils/Ntfs/FileSystemFactory.cs

@@ -22,8 +22,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System.IO;
     using DiscUtils.Vfs;
+    using System.IO;
 
     [VfsFileSystemFactory]
     internal class FileSystemFactory : VfsFileSystemFactory

DiscUtils/Ntfs/FixupRecordBase.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
 
     internal abstract class FixupRecordBase

DiscUtils/Ntfs/Index.cs

@@ -474,7 +474,7 @@ namespace DiscUtils.Ntfs
                 {
                     writer.WriteLine(prefix + "      " + EntryAsString(entry, _file.BestName, _name));
                 }
-                
+
                 if ((entry.Flags & IndexEntryFlags.Node) != 0)
                 {
                     NodeAsString(writer, prefix + "        ", GetSubBlock(entry).Node, ":i" + entry.ChildrenVirtualCluster);

DiscUtils/Ntfs/IndexBlock.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
 
     internal class IndexBlock : FixupRecordBase

DiscUtils/Ntfs/IndexNode.cs

@@ -404,7 +404,7 @@ namespace DiscUtils.Ntfs
             }
 
             return null;
-         }
+        }
 
         private IndexEntry PopulateEnd()
         {

DiscUtils/Ntfs/Internals/MasterFileTableAttribute.cs

@@ -1,9 +1,5 @@
 namespace DiscUtils.Ntfs.Internals
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     public sealed class MasterFileTableAttribute
     {
     }

DiscUtils/Ntfs/Internals/MasterFileTableRecord.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.Ntfs.Internals
 {
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.IO;
-
     public sealed class MasterFileTableRecord
     {
         private FileRecord _fileRecord;

DiscUtils/Ntfs/Internals/NtfsNamespace.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils.Ntfs.Internals
 {
-    using System;
-
     /// <summary>
     /// The known NTFS namespaces.
     /// </summary>

DiscUtils/Ntfs/LZNT1.cs

@@ -30,8 +30,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using DiscUtils.Compression;
+    using System;
 
     /// <summary>
     /// Implementation of the LZNT1 algorithm used for compressing NTFS files.

DiscUtils/Ntfs/NonResidentDataBuffer.cs

@@ -25,7 +25,6 @@ namespace DiscUtils.Ntfs
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using DiscUtils.Compression;
 
     internal class NonResidentDataBuffer : DiscUtils.Buffer, IMappedBuffer
     {

DiscUtils/Ntfs/NtfsAttribute.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;

DiscUtils/Ntfs/NtfsFileSystem.cs

@@ -1097,7 +1097,7 @@ namespace DiscUtils.Ntfs
                     }
                 }
 
-                UpdateStandardInformation(dirEntry, file, delegate(StandardInformation si) { si.FileAttributes = FileNameRecord.SetAttributes(newValue, si.FileAttributes); });
+                UpdateStandardInformation(dirEntry, file, delegate (StandardInformation si) { si.FileAttributes = FileNameRecord.SetAttributes(newValue, si.FileAttributes); });
             }
         }
 
@@ -1131,7 +1131,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.CreationTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.CreationTime = newTime; });
             }
         }
 
@@ -1165,7 +1165,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.LastAccessTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.LastAccessTime = newTime; });
             }
         }
 
@@ -1199,7 +1199,7 @@ namespace DiscUtils.Ntfs
         {
             using (new NtfsTransaction())
             {
-                UpdateStandardInformation(path, delegate(StandardInformation si) { si.ModificationTime = newTime; });
+                UpdateStandardInformation(path, delegate (StandardInformation si) { si.ModificationTime = newTime; });
             }
         }
 
@@ -1763,7 +1763,7 @@ namespace DiscUtils.Ntfs
             {
                 UpdateStandardInformation(
                     path,
-                    delegate(StandardInformation si)
+                    delegate (StandardInformation si)
                     {
                         si.CreationTime = info.CreationTime;
                         si.LastAccessTime = info.LastAccessTime;
@@ -1813,7 +1813,7 @@ namespace DiscUtils.Ntfs
             DirectoryEntry dirEntry = GetDirectoryEntry(path);
             if (dirEntry == null)
             {
-                    throw new FileNotFoundException("File not found", path);
+                throw new FileNotFoundException("File not found", path);
             }
 
             File file = GetFile(dirEntry.Reference);

DiscUtils/Ntfs/NtfsFormatter.cs

@@ -137,8 +137,8 @@ namespace DiscUtils.Ntfs
                 SetSecurityAttribute(volumeFile, "O:" + localAdminString + "G:BAD:(A;;0x12019f;;;SY)(A;;0x12019f;;;BA)");
                 volumeFile.UpdateRecordInMft();
 
-                _context.GetFileByIndex = delegate(long index) { return new File(_context, _context.Mft.GetRecord(index, false)); };
-                _context.AllocateFile = delegate(FileRecordFlags frf) { return new File(_context, _context.Mft.AllocateRecord(frf, false)); };
+                _context.GetFileByIndex = delegate (long index) { return new File(_context, _context.Mft.GetRecord(index, false)); };
+                _context.AllocateFile = delegate (FileRecordFlags frf) { return new File(_context, _context.Mft.AllocateRecord(frf, false)); };
 
                 File attrDefFile = CreateSystemFile(MasterFileTable.AttrDefIndex);
                 _context.AttributeDefinitions.WriteTo(attrDefFile);

DiscUtils/Ntfs/NtfsStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.Collections.Generic;
     using System.IO;
 
@@ -70,7 +69,7 @@ namespace DiscUtils.Ntfs
             value.ReadFrom(buffer, 0);
             return value;
         }
-        
+
         /// <summary>
         /// Sets the content of a stream.
         /// </summary>

DiscUtils/Ntfs/NtfsTransaction.cs

@@ -23,8 +23,6 @@
 namespace DiscUtils.Ntfs
 {
     using System;
-    using System.Collections.Generic;
-    using System.Text;
 
     internal sealed class NtfsTransaction : IDisposable
     {

DiscUtils/Ntfs/RawClusterStream.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils.Ntfs
 {
+    using DiscUtils;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils;
 
     /// <summary>
     /// Low-level non-resident attribute operations.

DiscUtils/Ntfs/SecurityDescriptor.cs

@@ -22,10 +22,8 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
     using System.Security.AccessControl;
-    using System.Security.Principal;
 
     internal sealed class SecurityDescriptor : IByteArraySerializable, IDiagnosticTraceable
     {

DiscUtils/Ntfs/ShortFileNameOption.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Controls whether short file names are created automatically.
     /// </summary>

DiscUtils/Ntfs/StructuredNtfsAttribute.cs

@@ -93,9 +93,9 @@ namespace DiscUtils.Ntfs
             {
                 using (Stream s = Open(FileAccess.Read))
                 {
-                        byte[] buffer = Utilities.ReadFully(s, (int)Length);
-                        _structure.ReadFrom(buffer, 0);
-                        _hasContent = s.Length != 0;
+                    byte[] buffer = Utilities.ReadFully(s, (int)Length);
+                    _structure.ReadFrom(buffer, 0);
+                    _hasContent = s.Length != 0;
                 }
 
                 _initialized = true;

DiscUtils/Ntfs/VolumeInformation.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
 
     internal sealed class VolumeInformation : IByteArraySerializable, IDiagnosticTraceable

DiscUtils/Ntfs/VolumeName.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Ntfs
 {
-    using System;
     using System.IO;
     using System.Text;
 

DiscUtils/ObjectCache.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
 
     /// <summary>

DiscUtils/Ownership.cs

@@ -22,10 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
-
     /// <summary>
     /// Enumeration used to indicate transfer of disposable objects.
     /// </summary>

DiscUtils/Partitions/BiosPartitionInfo.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Partitions
 {
     using System;
-    using System.IO;
 
     /// <summary>
     /// Provides access to partition records in a BIOS (MBR) partition table.

DiscUtils/Partitions/BiosPartitionedDiskBuilder.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Partitions
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
 
     /// <summary>
     /// Builds a stream with the contents of a BIOS partitioned disk.

DiscUtils/Partitions/GuidPartitionInfo.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Partitions
 {
     using System;
-    using System.IO;
 
     /// <summary>
     /// Provides access to partition records in a GUID partition table.

DiscUtils/Partitions/PartitionInfo.cs

@@ -24,7 +24,6 @@ namespace DiscUtils.Partitions
 {
     using System;
     using System.Globalization;
-    using System.IO;
 
     /// <summary>
     /// Base class representing a disk partition.

DiscUtils/PhysicalVolumeInfo.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Globalization;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Enumeration of possible types of physical volume.

DiscUtils/Range.cs

@@ -24,7 +24,6 @@ namespace DiscUtils
 {
     using System;
     using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Represents a range of values.

DiscUtils/Raw/DiskFactory.cs

@@ -23,7 +23,6 @@
 namespace DiscUtils.Raw
 {
     using System;
-    using System.Collections.Generic;
     using System.IO;
 
     [VirtualDiskFactory("RAW", ".img,.ima,.vfd,.flp,.bif")]

DiscUtils/Raw/DiskImageFile.cs

@@ -22,9 +22,9 @@
 
 namespace DiscUtils.Raw
 {
+    using DiscUtils.Partitions;
     using System;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Represents a single raw disk image file.

DiscUtils/Registry/BinHeader.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils.Registry
 {
-    using System;
     using System.IO;
 
     internal sealed class BinHeader : IByteArraySerializable

DiscUtils/SparseMemoryStream.cs

@@ -22,7 +22,6 @@
 
 namespace DiscUtils
 {
-    using System.Collections.Generic;
     using System.IO;
 
     /// <summary>

DiscUtils/Tuple.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-
     internal abstract class Tuple
     {
         public abstract object this[int i]

DiscUtils/UnixFileType.cs

@@ -22,8 +22,6 @@
 
 namespace DiscUtils
 {
-    using System;
-
     /// <summary>
     /// Standard Unix-style file type.
     /// </summary>

DiscUtils/Utilities.cs

@@ -29,7 +29,7 @@ namespace DiscUtils
     using System.Text.RegularExpressions;
 
     internal delegate TResult Func<T, TResult>(T arg);
-    
+
     internal static class Utilities
     {
         /// <summary>

DiscUtils/Vfs/VfsFileSystemFactoryAttribute.cs

@@ -23,8 +23,6 @@
 namespace DiscUtils.Vfs
 {
     using System;
-    using System.Collections.Generic;
-    using System.Text;
 
     /// <summary>
     /// Attribute identifying file system factory classes.

DiscUtils/VirtualDisk.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// Base class representing virtual hard disks.

DiscUtils/VolumeManager.cs

@@ -22,11 +22,11 @@
 
 namespace DiscUtils
 {
+    using DiscUtils.Partitions;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using DiscUtils.Partitions;
 
     /// <summary>
     /// VolumeManager interprets partitions and other on-disk structures (possibly combining multiple disks).