From 599454377e30f322b56ca10490b9897bbc2ce404 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Mon, 24 Nov 2025 20:27:29 +0000 Subject: [PATCH] [Refactor] Call string.Equals instead of string.Compare. --- Aaru.Filesystems/AppleDOS/Dir.cs | 2 +- Aaru.Filesystems/AppleDOS/File.cs | 31 +++++++++++++------------- Aaru.Filesystems/AppleDOS/Xattr.cs | 16 +++++++------- Aaru.Filesystems/AppleMFS/Dir.cs | 2 +- Aaru.Filesystems/AppleMFS/File.cs | 22 +++++++++---------- Aaru.Filesystems/AppleMFS/Xattr.cs | 34 ++++++++++++++--------------- Aaru.Filesystems/CBM/Dir.cs | 2 +- Aaru.Filesystems/CPM/Dir.cs | 22 ++++++++----------- Aaru.Filesystems/CPM/File.cs | 4 ++-- Aaru.Filesystems/CPM/Info.cs | 20 ++++++----------- Aaru.Filesystems/CPM/Super.cs | 21 ++++++++---------- Aaru.Filesystems/CPM/Xattr.cs | 9 ++++---- Aaru.Filesystems/LisaFS/File.cs | 26 ++++++++++------------ Aaru.Filesystems/UCSDPascal/Dir.cs | 2 +- Aaru.Filesystems/UCSDPascal/File.cs | 25 ++++++++++----------- Aaru.Images/Alcohol120/Read.cs | 4 ++-- Aaru.Images/BlindWrite5/Read.cs | 12 +++++----- Aaru.Images/CPCDSK/Identify.cs | 11 +++++----- Aaru.Images/CPCDSK/Read.cs | 18 +++++++-------- Aaru.Images/VHDX/Read.cs | 6 ++--- 20 files changed, 135 insertions(+), 154 deletions(-) diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs index 5091dbca2..ae18d8a3f 100644 --- a/Aaru.Filesystems/AppleDOS/Dir.cs +++ b/Aaru.Filesystems/AppleDOS/Dir.cs @@ -113,7 +113,7 @@ public sealed partial class AppleDOS if(!_mounted) return ErrorNumber.AccessDenied; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) return ErrorNumber.NotSupported; var contents = _catalogCache.Keys.ToList(); diff --git a/Aaru.Filesystems/AppleDOS/File.cs b/Aaru.Filesystems/AppleDOS/File.cs index 6bd7de265..23e42b285 100644 --- a/Aaru.Filesystems/AppleDOS/File.cs +++ b/Aaru.Filesystems/AppleDOS/File.cs @@ -158,9 +158,9 @@ public sealed partial class AppleDOS if(_lockedFiles.Contains(filename)) attributes |= FileAttributes.ReadOnly; if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Vtoc", StringComparison.InvariantCulture))) attributes |= FileAttributes.System; return ErrorNumber.NoError; @@ -182,13 +182,13 @@ public sealed partial class AppleDOS if(filename.Length > 30) return ErrorNumber.NameTooLong; if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Vtoc", StringComparison.InvariantCulture))) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture)) file = _catalogBlocks; - else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0) + else if(string.Equals(path, "$Vtoc", StringComparison.InvariantCulture)) file = _vtocBlocks; else file = _bootBlocks; @@ -273,16 +273,15 @@ public sealed partial class AppleDOS GetAttributes(path, out FileAttributes attrs); if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Vtoc", StringComparison.InvariantCulture))) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture)) stat.Length = _catalogBlocks.Length; - else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0) - stat.Length = _bootBlocks.Length; - else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0) - stat.Length = _vtocBlocks.Length; + else if(string.Equals(path, "$Boot", StringComparison.InvariantCulture)) + stat.Length = _bootBlocks.Length; + else if(string.Equals(path, "$Vtoc", StringComparison.InvariantCulture)) stat.Length = _vtocBlocks.Length; stat.Blocks = stat.Length / _vtoc.bytesPerSector; } diff --git a/Aaru.Filesystems/AppleDOS/Xattr.cs b/Aaru.Filesystems/AppleDOS/Xattr.cs index 1952c6c95..32af9d357 100644 --- a/Aaru.Filesystems/AppleDOS/Xattr.cs +++ b/Aaru.Filesystems/AppleDOS/Xattr.cs @@ -58,9 +58,9 @@ public sealed partial class AppleDOS xattrs = []; if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) {} + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Vtoc", StringComparison.InvariantCulture))) {} else { if(!_catalogCache.ContainsKey(filename)) return ErrorNumber.NoSuchFile; @@ -87,14 +87,14 @@ public sealed partial class AppleDOS if(filename.Length > 30) return ErrorNumber.NameTooLong; if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Vtoc", StringComparison.InvariantCulture))) return ErrorNumber.NoSuchExtendedAttribute; if(!_catalogCache.ContainsKey(filename)) return ErrorNumber.NoSuchFile; - if(string.Compare(xattr, "com.apple.dos.type", StringComparison.InvariantCulture) == 0) + if(string.Equals(xattr, "com.apple.dos.type", StringComparison.InvariantCulture)) { if(!_fileTypeCache.TryGetValue(filename, out byte type)) return ErrorNumber.InvalidArgument; @@ -104,7 +104,7 @@ public sealed partial class AppleDOS return ErrorNumber.NoError; } - if(string.Compare(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) != 0 || !_debug) + if(!string.Equals(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) || !_debug) return ErrorNumber.NoSuchExtendedAttribute; if(!_extentCache.TryGetValue(filename, out byte[] ts)) return ErrorNumber.InvalidArgument; diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs index 3442dc9a5..33476d039 100644 --- a/Aaru.Filesystems/AppleMFS/Dir.cs +++ b/Aaru.Filesystems/AppleMFS/Dir.cs @@ -128,7 +128,7 @@ public sealed partial class AppleMFS if(!_mounted) return ErrorNumber.AccessDenied; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) return ErrorNumber.NotSupported; var contents = _idToFilename.Select(static kvp => kvp.Value).ToList(); diff --git a/Aaru.Filesystems/AppleMFS/File.cs b/Aaru.Filesystems/AppleMFS/File.cs index b8302b79a..f57a977d9 100644 --- a/Aaru.Filesystems/AppleMFS/File.cs +++ b/Aaru.Filesystems/AppleMFS/File.cs @@ -208,15 +208,15 @@ public sealed partial class AppleMFS switch(_debug) { - case true when string.Compare(path, "$", StringComparison.InvariantCulture) == 0: + case true when string.Equals(path, "$", StringComparison.InvariantCulture): file = _directoryBlocks; break; - case true when string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 && _bootBlocks != null: + case true when string.Equals(path, "$Boot", StringComparison.InvariantCulture) && _bootBlocks != null: file = _bootBlocks; break; - case true when string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0: + case true when string.Equals(path, "$Bitmap", StringComparison.InvariantCulture): file = _blockMapBytes; break; @@ -292,10 +292,10 @@ public sealed partial class AppleMFS if(_debug) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$Bitmap", StringComparison.InvariantCulture) || + string.Equals(path, "$MDB", StringComparison.InvariantCulture)) { stat = new FileEntryInfo { @@ -305,24 +305,24 @@ public sealed partial class AppleMFS Attributes = FileAttributes.System }; - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture)) { stat.Blocks = _directoryBlocks.Length / stat.BlockSize + _directoryBlocks.Length % stat.BlockSize; stat.Length = _directoryBlocks.Length; } - else if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0) + else if(string.Equals(path, "$Bitmap", StringComparison.InvariantCulture)) { stat.Blocks = _blockMapBytes.Length / stat.BlockSize + _blockMapBytes.Length % stat.BlockSize; stat.Length = _blockMapBytes.Length; } - else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 && _bootBlocks != null) + else if(string.Equals(path, "$Boot", StringComparison.InvariantCulture) && _bootBlocks != null) { stat.Blocks = _bootBlocks.Length / stat.BlockSize + _bootBlocks.Length % stat.BlockSize; stat.Length = _bootBlocks.Length; } - else if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0) + else if(string.Equals(path, "$MDB", StringComparison.InvariantCulture)) { stat.Blocks = _mdbBlocks.Length / stat.BlockSize + _mdbBlocks.Length % stat.BlockSize; stat.Length = _mdbBlocks.Length; diff --git a/Aaru.Filesystems/AppleMFS/Xattr.cs b/Aaru.Filesystems/AppleMFS/Xattr.cs index 5a70bb547..a0cdcf19f 100644 --- a/Aaru.Filesystems/AppleMFS/Xattr.cs +++ b/Aaru.Filesystems/AppleMFS/Xattr.cs @@ -60,10 +60,10 @@ public sealed partial class AppleMFS if(_debug) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Bitmap", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$MDB", StringComparison.InvariantCulture)) { if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSonyTag)) xattrs.Add("com.apple.macintosh.tags"); @@ -107,15 +107,15 @@ public sealed partial class AppleMFS if(_debug) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Bitmap", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture) || + string.Equals(path, "$MDB", StringComparison.InvariantCulture)) { if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSonyTag) && - string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) == 0) + string.Equals(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture)) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture)) { buf = new byte[_directoryTags.Length]; Array.Copy(_directoryTags, 0, buf, 0, buf.Length); @@ -123,7 +123,7 @@ public sealed partial class AppleMFS return ErrorNumber.NoError; } - if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$Bitmap", StringComparison.InvariantCulture)) { buf = new byte[_bitmapTags.Length]; Array.Copy(_bitmapTags, 0, buf, 0, buf.Length); @@ -131,7 +131,7 @@ public sealed partial class AppleMFS return ErrorNumber.NoError; } - if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$Boot", StringComparison.InvariantCulture)) { buf = new byte[_bootTags.Length]; Array.Copy(_bootTags, 0, buf, 0, buf.Length); @@ -139,7 +139,7 @@ public sealed partial class AppleMFS return ErrorNumber.NoError; } - if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$MDB", StringComparison.InvariantCulture)) { buf = new byte[_mdbTags.Length]; Array.Copy(_mdbTags, 0, buf, 0, buf.Length); @@ -160,17 +160,17 @@ public sealed partial class AppleMFS switch(entry.flRLgLen) { - case > 0 when string.Compare(xattr, "com.apple.ResourceFork", StringComparison.InvariantCulture) == 0: + case > 0 when string.Equals(xattr, "com.apple.ResourceFork", StringComparison.InvariantCulture): error = ReadFile(path, out buf, true, false); return error; - case > 0 when string.Compare(xattr, "com.apple.ResourceFork.tags", StringComparison.InvariantCulture) == 0: + case > 0 when string.Equals(xattr, "com.apple.ResourceFork.tags", StringComparison.InvariantCulture): error = ReadFile(path, out buf, true, true); return error; } - if(string.Compare(xattr, "com.apple.FinderInfo", StringComparison.InvariantCulture) == 0) + if(string.Equals(xattr, "com.apple.FinderInfo", StringComparison.InvariantCulture)) { buf = Marshal.StructureToByteArrayBigEndian(entry.flUsrWds); @@ -179,7 +179,7 @@ public sealed partial class AppleMFS if(!_debug || !_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSonyTag) || - string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) != 0) + !string.Equals(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture)) return ErrorNumber.NoSuchExtendedAttribute; error = ReadFile(path, out buf, false, true); diff --git a/Aaru.Filesystems/CBM/Dir.cs b/Aaru.Filesystems/CBM/Dir.cs index b39cd273f..8e8ef214e 100644 --- a/Aaru.Filesystems/CBM/Dir.cs +++ b/Aaru.Filesystems/CBM/Dir.cs @@ -46,7 +46,7 @@ public sealed partial class CBM if(!_mounted) return ErrorNumber.AccessDenied; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) return ErrorNumber.NotSupported; var contents = _cache.Keys.ToList(); diff --git a/Aaru.Filesystems/CPM/Dir.cs b/Aaru.Filesystems/CPM/Dir.cs index 08c46808b..4dcda0cf9 100644 --- a/Aaru.Filesystems/CPM/Dir.cs +++ b/Aaru.Filesystems/CPM/Dir.cs @@ -63,14 +63,12 @@ public sealed partial class CPM if((entry.statusUser & 0x7F) < 0x20) { for(var f = 0; f < 8; f++) - { - if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) return false; - } + if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) + return false; for(var e = 0; e < 3; e++) - { - if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) return false; - } + if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) + return false; if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename)) fileCount++; } @@ -81,14 +79,12 @@ public sealed partial class CPM case 0x20: { for(var f = 0; f < 8; f++) - { - if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) return false; - } + if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) + return false; for(var e = 0; e < 3; e++) - { - if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) return false; - } + if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) + return false; _label = Encoding.ASCII.GetString(directory, off + 1, 11).Trim(); _labelCreationDate = new byte[4]; @@ -129,7 +125,7 @@ public sealed partial class CPM if(!_mounted) return ErrorNumber.AccessDenied; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) return ErrorNumber.NotSupported; node = new CpmDirNode diff --git a/Aaru.Filesystems/CPM/File.cs b/Aaru.Filesystems/CPM/File.cs index 51e975a76..f716e9f3b 100644 --- a/Aaru.Filesystems/CPM/File.cs +++ b/Aaru.Filesystems/CPM/File.cs @@ -51,7 +51,7 @@ public sealed partial class CPM if(pathElements.Length != 1) return ErrorNumber.NotSupported; if(string.IsNullOrEmpty(pathElements[0]) || - string.Compare(pathElements[0], "/", StringComparison.OrdinalIgnoreCase) == 0) + string.Equals(pathElements[0], "/", StringComparison.OrdinalIgnoreCase)) { attributes = new FileAttributes(); attributes = FileAttributes.Directory; @@ -144,7 +144,7 @@ public sealed partial class CPM if(pathElements.Length != 1) return ErrorNumber.NotSupported; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) { return _statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out stat) ? ErrorNumber.NoError diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs index fb90da62e..ec6442210 100644 --- a/Aaru.Filesystems/CPM/Info.cs +++ b/Aaru.Filesystems/CPM/Info.cs @@ -936,7 +936,7 @@ public sealed partial class CPM else { // Head changes after every track - if(string.Compare(def.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0) + if(string.Equals(def.order, "SIDES", StringComparison.InvariantCultureIgnoreCase)) { _sectorMask = new int[def.side1.sectorIds.Length + def.side2.sectorIds.Length]; @@ -952,10 +952,7 @@ public sealed partial class CPM } // Head changes after whole side - else if(string.Compare(def.order, - "CYLINDERS", - StringComparison.InvariantCultureIgnoreCase) == - 0) + else if(string.Equals(def.order, "CYLINDERS", StringComparison.InvariantCultureIgnoreCase)) { for(var m = 0; m < def.side1.sectorIds.Length; m++) _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0]; @@ -972,10 +969,7 @@ public sealed partial class CPM } // TODO: Implement COLUMBIA ordering - else if(string.Compare(def.order, - "COLUMBIA", - StringComparison.InvariantCultureIgnoreCase) == - 0) + else if(string.Equals(def.order, "COLUMBIA", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, Localization @@ -985,8 +979,7 @@ public sealed partial class CPM } // TODO: Implement EAGLE ordering - else if(string.Compare(def.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase) == - 0) + else if(string.Equals(def.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, Localization @@ -1033,8 +1026,9 @@ public sealed partial class CPM // Complement of the directory bytes if needed if(def.complement) - for(var b = 0; b < directory.Length; b++) - directory[b] = (byte)(~directory[b] & 0xFF); + { + for(var b = 0; b < directory.Length; b++) directory[b] = (byte)(~directory[b] & 0xFF); + } // Check the directory if(CheckDir(directory)) diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs index f130b1ca2..d3c816099 100644 --- a/Aaru.Filesystems/CPM/Super.cs +++ b/Aaru.Filesystems/CPM/Super.cs @@ -75,7 +75,7 @@ public sealed partial class CPM else { // Head changes after every track - if(string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0) + if(string.Equals(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase)) { _sectorMask = new int[_workingDefinition.side1.sectorIds.Length + _workingDefinition.side2.sectorIds.Length]; @@ -94,10 +94,7 @@ public sealed partial class CPM } // Head changes after whole side - else if(string.Compare(_workingDefinition.order, - "CYLINDERS", - StringComparison.InvariantCultureIgnoreCase) == - 0) + else if(string.Equals(_workingDefinition.order, "CYLINDERS", StringComparison.InvariantCultureIgnoreCase)) { for(var m = 0; m < _workingDefinition.side1.sectorIds.Length; m++) _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0]; @@ -119,8 +116,7 @@ public sealed partial class CPM } // TODO: Implement COLUMBIA ordering - else if(string.Compare(_workingDefinition.order, "COLUMBIA", StringComparison.InvariantCultureIgnoreCase) == - 0) + else if(string.Equals(_workingDefinition.order, "COLUMBIA", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, Localization @@ -130,7 +126,7 @@ public sealed partial class CPM } // TODO: Implement EAGLE ordering - else if(string.Compare(_workingDefinition.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase) == 0) + else if(string.Equals(_workingDefinition.order, "EAGLE", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, Localization @@ -151,8 +147,8 @@ public sealed partial class CPM // Deinterleave whole volume Dictionary deinterleavedSectors = new(); - if(_workingDefinition.sides == 1 || - string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0) + if(_workingDefinition.sides == 1 || + string.Equals(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Debug(MODULE_NAME, Localization.Deinterleaving_whole_volume); @@ -169,8 +165,9 @@ public sealed partial class CPM if(errno != ErrorNumber.NoError) return errno; if(_workingDefinition.complement) - for(var b = 0; b < readSector.Length; b++) - readSector[b] = (byte)(~readSector[b] & 0xFF); + { + for(var b = 0; b < readSector.Length; b++) readSector[b] = (byte)(~readSector[b] & 0xFF); + } deinterleavedSectors.Add((ulong)p, readSector); } diff --git a/Aaru.Filesystems/CPM/Xattr.cs b/Aaru.Filesystems/CPM/Xattr.cs index aaba1bf83..f129d49ba 100644 --- a/Aaru.Filesystems/CPM/Xattr.cs +++ b/Aaru.Filesystems/CPM/Xattr.cs @@ -51,11 +51,12 @@ public sealed partial class CPM if(!_fileCache.ContainsKey(pathElements[0].ToUpperInvariant())) return ErrorNumber.NoSuchFile; - if(string.Compare(xattr, "com.caldera.cpm.password", StringComparison.InvariantCulture) == 0) - if(!_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf)) - return ErrorNumber.NoError; + if(string.Equals(xattr, "com.caldera.cpm.password", StringComparison.InvariantCulture)) + { + if(!_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf)) return ErrorNumber.NoError; + } - if(string.Compare(xattr, "com.caldera.cpm.password.text", StringComparison.InvariantCulture) != 0) + if(!string.Equals(xattr, "com.caldera.cpm.password.text", StringComparison.InvariantCulture)) return ErrorNumber.NoSuchExtendedAttribute; return !_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf) diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs index ec9b47ab8..a3639fea6 100644 --- a/Aaru.Filesystems/LisaFS/File.cs +++ b/Aaru.Filesystems/LisaFS/File.cs @@ -105,9 +105,8 @@ public sealed partial class LisaFS if(!_mounted || !_debug) return ErrorNumber.AccessDenied; if(fileId is > 4 or <= 0) - { - if(fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED) return ErrorNumber.InvalidArgument; - } + if(fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED) + return ErrorNumber.InvalidArgument; if(_systemFileCache.TryGetValue(fileId, out buf) && !tags) return ErrorNumber.NoError; @@ -330,9 +329,8 @@ public sealed partial class LisaFS if(!tags) { if(_fileSizeCache.TryGetValue(fileId, out int realSize)) - { - if(realSize > temp.Length) AaruLogging.Error(Localization.File_0_gets_truncated, fileId); - } + if(realSize > temp.Length) + AaruLogging.Error(Localization.File_0_gets_truncated, fileId); buf = temp; @@ -368,42 +366,42 @@ public sealed partial class LisaFS if(_debug && pathElements.Length == 1) { - if(string.Compare(pathElements[0], "$MDDF", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$MDDF", StringComparison.InvariantCulture)) { fileId = (short)FILEID_MDDF; return ErrorNumber.NoError; } - if(string.Compare(pathElements[0], "$Boot", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$Boot", StringComparison.InvariantCulture)) { fileId = FILEID_BOOT_SIGNED; return ErrorNumber.NoError; } - if(string.Compare(pathElements[0], "$Loader", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$Loader", StringComparison.InvariantCulture)) { fileId = FILEID_LOADER_SIGNED; return ErrorNumber.NoError; } - if(string.Compare(pathElements[0], "$Bitmap", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$Bitmap", StringComparison.InvariantCulture)) { fileId = (short)FILEID_BITMAP; return ErrorNumber.NoError; } - if(string.Compare(pathElements[0], "$S-Record", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$S-Record", StringComparison.InvariantCulture)) { fileId = (short)FILEID_SRECORD; return ErrorNumber.NoError; } - if(string.Compare(pathElements[0], "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(pathElements[0], "$", StringComparison.InvariantCulture)) { fileId = DIRID_ROOT; isDir = true; @@ -421,8 +419,8 @@ public sealed partial class LisaFS string filename = StringHandlers.CToString(entry.filename, _encoding); // LisaOS is case insensitive - if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 || - entry.parentID != fileId) + if(!string.Equals(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) || + entry.parentID != fileId) continue; fileId = entry.fileID; diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs index ef26b819f..61931d2ad 100644 --- a/Aaru.Filesystems/UCSDPascal/Dir.cs +++ b/Aaru.Filesystems/UCSDPascal/Dir.cs @@ -50,7 +50,7 @@ public sealed partial class PascalPlugin if(!_mounted) return ErrorNumber.AccessDenied; - if(!string.IsNullOrEmpty(path) && string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0) + if(!string.IsNullOrEmpty(path) && !string.Equals(path, "/", StringComparison.OrdinalIgnoreCase)) return ErrorNumber.NotSupported; List contents = _fileEntries.ConvertAll(ent => StringHandlers.PascalToString(ent.Filename, _encoding)); diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs index 33a4ee99a..288e20390 100644 --- a/Aaru.Filesystems/UCSDPascal/File.cs +++ b/Aaru.Filesystems/UCSDPascal/File.cs @@ -43,13 +43,12 @@ public sealed partial class PascalPlugin { entry = new PascalFileEntry(); - foreach(PascalFileEntry ent in _fileEntries.Where(ent => string.Compare(path, - StringHandlers - .PascalToString(ent.Filename, - _encoding), - StringComparison - .InvariantCultureIgnoreCase) == - 0)) + foreach(PascalFileEntry ent in _fileEntries.Where(ent => string.Equals(path, + StringHandlers + .PascalToString(ent.Filename, + _encoding), + StringComparison + .InvariantCultureIgnoreCase))) { entry = ent; @@ -95,9 +94,9 @@ public sealed partial class PascalPlugin byte[] file; if(_debug && - (string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)) - file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ? _catalogBlocks : _bootBlocks; + (string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture))) + file = string.Equals(path, "$", StringComparison.InvariantCulture) ? _catalogBlocks : _bootBlocks; else { ErrorNumber error = GetFileEntry(path, out PascalFileEntry entry); @@ -173,8 +172,8 @@ public sealed partial class PascalPlugin if(_debug) { - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0 || - string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture) || + string.Equals(path, "$Boot", StringComparison.InvariantCulture)) { stat = new FileEntryInfo { @@ -183,7 +182,7 @@ public sealed partial class PascalPlugin Links = 1 }; - if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0) + if(string.Equals(path, "$", StringComparison.InvariantCulture)) { stat.Blocks = _catalogBlocks.Length / stat.BlockSize + _catalogBlocks.Length % stat.BlockSize; diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs index 76020b904..a2c52c164 100644 --- a/Aaru.Images/Alcohol120/Read.cs +++ b/Aaru.Images/Alcohol120/Read.cs @@ -361,9 +361,9 @@ public sealed partial class Alcohol120 else if(Path.GetExtension(imageFilter.BasePath).Equals(".xmd", StringComparison.InvariantCultureIgnoreCase)) alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf"; } - else if(string.Compare(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase) == 0) + else if(string.Equals(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase)) alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf"; - else if(string.Compare(alcFile, "*.xmf", StringComparison.InvariantCultureIgnoreCase) == 0) + else if(string.Equals(alcFile, "*.xmf", StringComparison.InvariantCultureIgnoreCase)) alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf"; if(_header is { bcaLength: > 0, bcaOffset: > 0 } && _isDvd) diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs index d63216515..0fc50ee3e 100644 --- a/Aaru.Images/BlindWrite5/Read.cs +++ b/Aaru.Images/BlindWrite5/Read.cs @@ -851,10 +851,9 @@ public sealed partial class BlindWrite5 var lowerCaseFileName = false; string basePath; - bool version5 = string.Compare(Path.GetExtension(imageFilter.Filename), - ".B5T", - StringComparison.OrdinalIgnoreCase) == - 0; + bool version5 = string.Equals(Path.GetExtension(imageFilter.Filename), + ".B5T", + StringComparison.OrdinalIgnoreCase); string firstExtension = version5 ? "B5I" : "B6I"; string firstExtensionLower = version5 ? "b5i" : "b6i"; @@ -1295,10 +1294,9 @@ public sealed partial class BlindWrite5 _imageInfo.DriveFirmwareRevision = StringHandlers.CToString(_header.revision); _imageInfo.Application = "BlindWrite"; - if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase) == 0) + if(string.Equals(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase)) _imageInfo.ApplicationVersion = "5"; - else if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B6T", StringComparison.OrdinalIgnoreCase) == - 0) + else if(string.Equals(Path.GetExtension(imageFilter.Filename), ".B6T", StringComparison.OrdinalIgnoreCase)) _imageInfo.ApplicationVersion = "6"; _imageInfo.Version = "5"; diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs index 6652058ab..63562c72c 100644 --- a/Aaru.Images/CPCDSK/Identify.cs +++ b/Aaru.Images/CPCDSK/Identify.cs @@ -57,8 +57,9 @@ public sealed partial class Cpcdsk int pos; for(pos = 0; pos < 254; pos++) - if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) - break; + { + if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) break; + } if(pos >= 254) return false; @@ -66,9 +67,9 @@ public sealed partial class Cpcdsk AaruLogging.Debug(MODULE_NAME, Localization.magic_equals_0_quoted, magic); - return string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0 || - string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0 || - string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0; + return string.Equals(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) || + string.Equals(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase); } #endregion diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs index 421d5c1e7..072221f7a 100644 --- a/Aaru.Images/CPCDSK/Read.cs +++ b/Aaru.Images/CPCDSK/Read.cs @@ -63,9 +63,8 @@ public sealed partial class Cpcdsk int pos; for(pos = 0; pos < 254; pos++) - { - if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) break; - } + if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) + break; if(pos >= 254) return ErrorNumber.InvalidArgument; @@ -76,12 +75,12 @@ public sealed partial class Cpcdsk DiskInfo header = Marshal.ByteArrayToStructureLittleEndian(headerB); - if(string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) != 0 && - string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) != 0 && - string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase) != 0) + if(!string.Equals(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) && + !string.Equals(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) && + !string.Equals(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase)) return ErrorNumber.InvalidArgument; - _extended = string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0; + _extended = string.Equals(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase); AaruLogging.Debug(MODULE_NAME, Localization.Extended_equals_0, _extended); AaruLogging.Debug(MODULE_NAME, Localization.magic_equals_0_quoted, magic); @@ -133,10 +132,9 @@ public sealed partial class Cpcdsk stream.EnsureRead(trackB, 0, 256); TrackInfo trackInfo = Marshal.ByteArrayToStructureLittleEndian(trackB); - if(string.Compare(TRACK_ID, + if(!string.Equals(TRACK_ID, Encoding.ASCII.GetString(trackInfo.magic), - StringComparison.InvariantCultureIgnoreCase) != - 0) + StringComparison.InvariantCultureIgnoreCase)) { AaruLogging.Error(Localization.Not_the_expected_track_info); diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs index 0460a36f1..2a94a02dc 100644 --- a/Aaru.Images/VHDX/Read.cs +++ b/Aaru.Images/VHDX/Read.cs @@ -294,7 +294,7 @@ public sealed partial class Vhdx IFilter parentFilter; - if(string.Compare(entryType, RELATIVE_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0) + if(string.Equals(entryType, RELATIVE_PATH_KEY, StringComparison.OrdinalIgnoreCase)) { stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin); var tmpVal = new byte[parentEntry.valueLength]; @@ -338,8 +338,8 @@ public sealed partial class Vhdx SentrySdk.CaptureException(ex); } } - else if(string.Compare(entryType, VOLUME_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0 || - string.Compare(entryType, ABSOLUTE_WIN32_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0) + else if(string.Equals(entryType, VOLUME_PATH_KEY, StringComparison.OrdinalIgnoreCase) || + string.Equals(entryType, ABSOLUTE_WIN32_PATH_KEY, StringComparison.OrdinalIgnoreCase)) { stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin); var tmpVal = new byte[parentEntry.valueLength];