aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Call string.Equals instead of string.Compare.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-24 20:27:29 +00:00
parent 13a200d10b
commit 599454377e
20 changed files with 135 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Images/Alcohol120/Read.cs
View File

@@ -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)

12
Aaru.Images/BlindWrite5/Read.cs
View File

@@ -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";

11
Aaru.Images/CPCDSK/Identify.cs
View File

@@ -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

18
Aaru.Images/CPCDSK/Read.cs
View File

@@ -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<DiskInfo>(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<TrackInfo>(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);

6
Aaru.Images/VHDX/Read.cs
View File

@@ -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];