From cca08e7103e6beb6d5a30ca32518af93af3e349d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 4 Nov 2025 10:27:00 -0500 Subject: [PATCH] Use consistent naming --- .../Extensions/ISO9660.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SabreTools.Serialization/Extensions/ISO9660.cs b/SabreTools.Serialization/Extensions/ISO9660.cs index c10530cf..cc1aaa81 100644 --- a/SabreTools.Serialization/Extensions/ISO9660.cs +++ b/SabreTools.Serialization/Extensions/ISO9660.cs @@ -14,43 +14,43 @@ namespace SabreTools.Data.Extensions /// Size of a logical block public static short GetLogicalBlockSize(this VolumeDescriptor vd, short sectorLength) { - BothInt16 blockLength; + BothInt16 blockSize; if (vd is PrimaryVolumeDescriptor pvd) - blockLength = pvd.LogicalBlockSize; + blockSize = pvd.LogicalBlockSize; else if (vd is SupplementaryVolumeDescriptor svd) - blockLength = svd.LogicalBlockSize; + blockSize = svd.LogicalBlockSize; else return sectorLength; // If the block size is inconsistent - if (!blockLength.IsValid) + if (!blockSize.IsValid) { - bool leValid = BlockLengthValid(blockLength.LittleEndian, sectorLength); - bool beValid = BlockLengthValid(blockLength.BigEndian, sectorLength); + bool leValid = BlockSizeValid(blockSize.LittleEndian, sectorLength); + bool beValid = BlockSizeValid(blockSize.BigEndian, sectorLength); if (leValid && !beValid) - blockLength = blockLength.LittleEndian; + blockSize = blockSize.LittleEndian; else if (beValid && !leValid) - blockLength = blockLength.BigEndian; + blockSize = blockSize.BigEndian; else return sectorLength; } - // Validate logical block length - if (!BlockLengthValid(blockLength, sectorLength)) - blockLength = sectorLength; + // Validate logical block size + if (!BlockSizeValid(blockSize, sectorLength)) + blockSize = sectorLength; - return blockLength; + return blockSize; } /// - /// Indicates if a block length is valid + /// Indicates if a block size is valid /// - /// Block length to check + /// Block length to check /// Defined sector length /// True if the block length is valid, false otherwise - private static bool BlockLengthValid(short blockLength, short sectorLength) - => blockLength >= 512 && blockLength <= sectorLength && (blockLength & (blockLength - 1)) == 0; + private static bool BlockSizeValid(short blockSize, short sectorLength) + => blockSize >= 512 && blockSize <= sectorLength && (blockSize & (blockSize - 1)) == 0; /// /// Indicates if an array contains all ASCII numeric digits