Simplify using statements

SabreTools · Aug 8, 2024 · 45de58d · 45de58d
1 parent 10f1532
commit 45de58d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/NDecrypt.N3DS/CIATool.cs b/NDecrypt.N3DS/CIATool.cs
@@ -69,20 +69,20 @@ public bool ProcessFile()
  try
  {
  // Open the read and write on the same file for inplace processing
- using (BinaryReader reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
- using (BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)))
+ using BinaryReader reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite));
+ using BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite));
+
+ // Deserialize the CIA information
+ var cia = Serializer.ReadCIA(reader);
+ if (cia == null)
  {
- var cia = Serializer.ReadCIA(reader);
- if (cia == null)
- {
- Console.WriteLine("Error: Not a 3DS CIA!");
- return false;
- }
-
- // Process all NCCH partitions
- ProcessAllPartitions(cia, reader, writer);
+ Console.WriteLine("Error: Not a 3DS CIA!");
+ return false;
  }
 
+ // Process all NCCH partitions
+ ProcessAllPartitions(cia, reader, writer);
+
  return false;
  }
  catch

diff --git a/NDecrypt.N3DS/ThreeDSTool.cs b/NDecrypt.N3DS/ThreeDSTool.cs
@@ -68,20 +68,20 @@ public bool ProcessFile()
  try
  {
  // Open the read and write on the same file for inplace processing
- using (var reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
- using (var writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)))
+ using var reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite));
+ using var writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite));
+
+ // Deserialize the cart information
+ (var cart, var backupHeader) = Serializer.ReadCart(reader, decryptArgs.Development);
+ if (cart?.Header == null)
  {
- (var cart, var backupHeader) = Serializer.ReadCart(reader, decryptArgs.Development);
- if (cart?.Header == null)
- {
- Console.WriteLine("Error: Not a 3DS cart image!");
- return false;
- }
-
- // Process all 8 NCCH partitions
- ProcessAllPartitions(cart.Header, backupHeader, reader, writer);
+ Console.WriteLine("Error: Not a 3DS cart image!");
+ return false;
  }
 
+ // Process all 8 NCCH partitions
+ ProcessAllPartitions(cart.Header, backupHeader, reader, writer);
+
  return true;
  }
  catch

diff --git a/NDecrypt.Nitro/DSTool.cs b/NDecrypt.Nitro/DSTool.cs
@@ -39,20 +39,20 @@ public bool ProcessFile()
  try
  {
  // Open the read and write on the same file for inplace processing
- using (BinaryReader reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
- using (BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite)))
+ using BinaryReader reader = new BinaryReader(File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite));
+ using BinaryWriter writer = new BinaryWriter(File.Open(filename, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite));
+
+ // Deserialize the cart information
+ Cart? cart = Serializer.ReadCart(reader);
+ if (cart == null)
  {
- Cart? cart = Serializer.ReadCart(reader);
- if (cart == null)
- {
- Console.WriteLine("Error: Not a DS or DSi Rom!");
- return false;
- }
-
- // Process the secure area
- ProcessSecureArea(cart, reader, writer);
+ Console.WriteLine("Error: Not a DS or DSi Rom!");
+ return false;
  }
 
+ // Process the secure area
+ ProcessSecureArea(cart, reader, writer);
+
  return true;
  }
  catch