Simplify using statements

This commit is contained in:
Matt Nadareski
2024-08-08 14:01:42 -04:00
parent 10f1532bb1
commit 45de58d2f1
3 changed files with 33 additions and 33 deletions

View File

@@ -69,20 +69,20 @@ namespace NDecrypt.N3DS
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

View File

@@ -68,20 +68,20 @@ namespace NDecrypt.N3DS
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

View File

@@ -39,20 +39,20 @@ namespace NDecrypt.Nitro
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)))
{
Cart? cart = Serializer.ReadCart(reader);
if (cart == null)
{
Console.WriteLine("Error: Not a DS or DSi Rom!");
return false;
}
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));
// Process the secure area
ProcessSecureArea(cart, reader, writer);
// Deserialize the cart information
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);
return true;
}
catch