Changeset 1873 for trunk/eraser6/Eraser.Util/VolumeInfo.cs

Timestamp:

3/1/2010 9:52:43 AM (2 years ago)

Author:

lowjoel

Message:

Don't double error-handle in VolumeInfo?: The OpenHandle? and Open functions check for a valid file handle each, which is redundant. Since OpenHandle? is supposed to be called internally from the assembly, do no error checking and assume the calling function knows what it is doing. This can be seen in NtfsApi? where an exception has been replaced with an if-statement.

File:

• trunk/eraser6/Eraser.Util/VolumeInfo.cs (modified) (2 diffs)

trunk/eraser6/Eraser.Util/VolumeInfo.cs

@@ -620 +620 @@
             //Check that the handle is valid
             if (handle.IsInvalid)
-                throw Win32ErrorCode.GetExceptionForWin32Error(Marshal.GetLastWin32Error());
+            {
+                int errorCode = Marshal.GetLastWin32Error();
+                handle.Close();
+                throw Win32ErrorCode.GetExceptionForWin32Error(errorCode);
+            }
 
             //Return the FileStream
@@ -660 +664 @@
             if (openPath.Length > 0 && openPath[openPath.Length - 1] == '\\')
                 openPath = openPath.Remove(openPath.Length - 1);
-            SafeFileHandle result = NativeMethods.CreateFile(openPath, access,
-                (uint)share, IntPtr.Zero, (uint)FileMode.Open, (uint)options, IntPtr.Zero);
-            if (result.IsInvalid)
-            {
-                int errorCode = Marshal.GetLastWin32Error();
-                result.Close();
-                throw Win32ErrorCode.GetExceptionForWin32Error(errorCode);
-            }
-
-            return result;
+            return NativeMethods.CreateFile(openPath, access, (uint)share, IntPtr.Zero,
+                (uint)FileMode.Open, (uint)options, IntPtr.Zero);
         }