NTFS: NTFSFileSystem: Minor code refactoring

TalAloni · TalAloni · commit 030e11d5ee21 · 2018-11-08T13:32:14.000+02:00
diff --git a/DiskAccessLibrary/FileSystems/NTFS/Adapters/NTFSFileSystem.cs b/DiskAccessLibrary/FileSystems/NTFS/Adapters/NTFSFileSystem.cs
@@ -108,25 +108,24 @@ public override Stream OpenFile(string path, FileMode mode, FileAccess access, F
                 {
                 }
 
-                if (mode == FileMode.CreateNew)
+                if (fileExists)
                 {
-                    if (fileExists)
+                    if (mode == FileMode.CreateNew)
                     {
                         throw new AlreadyExistsException();
                     }
+                    else if (mode == FileMode.Create)
+                    {
+                        mode = FileMode.Truncate;
+                    }
                 }
-
-                if (!fileExists)
+                else
                 {
                     string directoryPath = Path.GetDirectoryName(path);
                     string fileName = Path.GetFileName(path);
                     FileRecord directoryRecord = m_volume.GetFileRecord(directoryPath);
                     fileRecord = m_volume.CreateFile(directoryRecord.BaseSegmentReference, fileName, false);
                 }
-                else if (mode == FileMode.Create)
-                {
-                    mode = FileMode.Truncate;
-                }
             }
             else // Open, Truncate or Append
             {

Original file line number	Diff line number	Diff line change
`@@ -108,25 +108,24 @@ public override Stream OpenFile(string path, FileMode mode, FileAccess access, F`
`108`	`108`	`{`
`109`	`109`	`}`
`110`	`110`
`111`		`- if (mode == FileMode.CreateNew)`
	`111`	`+ if (fileExists)`
`112`	`112`	`{`
`113`		`- if (fileExists)`
	`113`	`+ if (mode == FileMode.CreateNew)`
`114`	`114`	`{`
`115`	`115`	`throw new AlreadyExistsException();`
`116`	`116`	`}`
	`117`	`+ else if (mode == FileMode.Create)`
	`118`	`+ {`
	`119`	`+ mode = FileMode.Truncate;`
	`120`	`+ }`
`117`	`121`	`}`
`118`		`-`
`119`		`- if (!fileExists)`
	`122`	`+ else`
`120`	`123`	`{`
`121`	`124`	`string directoryPath = Path.GetDirectoryName(path);`
`122`	`125`	`string fileName = Path.GetFileName(path);`
`123`	`126`	`FileRecord directoryRecord = m_volume.GetFileRecord(directoryPath);`
`124`	`127`	`fileRecord = m_volume.CreateFile(directoryRecord.BaseSegmentReference, fileName, false);`
`125`	`128`	`}`
`126`		`- else if (mode == FileMode.Create)`
`127`		`- {`
`128`		`- mode = FileMode.Truncate;`
`129`		`- }`
`130`	`129`	`}`
`131`	`130`	`else // Open, Truncate or Append`
`132`	`131`	`{`