From 4ee4a6e85fe521b9020eddd9d962f32853807f91 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 4 Nov 2025 10:07:57 -0500 Subject: [PATCH] Slight extension cleanup --- SabreTools.Serialization/Extensions/ISO9660.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/SabreTools.Serialization/Extensions/ISO9660.cs b/SabreTools.Serialization/Extensions/ISO9660.cs index 7919c7e3..94b306e1 100644 --- a/SabreTools.Serialization/Extensions/ISO9660.cs +++ b/SabreTools.Serialization/Extensions/ISO9660.cs @@ -1,6 +1,5 @@ using System; using SabreTools.Data.Models.ISO9660; -using SabreTools.IO.Extensions; namespace SabreTools.Data.Extensions { @@ -25,19 +24,15 @@ namespace SabreTools.Data.Extensions { // If logical block size is ambiguous check if only one is valid, otherwise default to sector length short le = bvd.LogicalBlockSize.LittleEndian; + bool leValid = le >= 512 && le <= sectorLength && (le & (le - 1)) == 0; + short be = bvd.LogicalBlockSize.LittleEndian; - bool le_valid = true; - bool be_valid = true; - if (le < 512 || le > sectorLength || (le & (le - 1)) != 0) - le_valid = false; - if (be < 512 || be > sectorLength || (be & (be - 1)) != 0) - be_valid = false; - if (le_valid && !be_valid) + bool beValid = be >= 512 && be <= sectorLength && (be & (be - 1)) == 0; + + if (leValid && !beValid) blockLength = le; - else if (be_valid && !le_valid) + else if (beValid && !leValid) blockLength = be; - else - blockLength = sectorLength; } return blockLength;