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

Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-04 08:13:57 +01:00
parent bd35ccc4f4
commit 62fbb024f7
14 changed files with 78 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Aaru.Filesystems/ISO9660/Dir.cs
View File

@@ -85,7 +85,7 @@ public sealed partial class ISO9660
string[] pieces = cutPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
KeyValuePair<string, DecodedDirectoryEntry> entry =
_rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
_rootDirectoryCache.FirstOrDefault(t => t.Key.Equals(pieces[0], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -99,7 +99,8 @@ public sealed partial class ISO9660
for(var p = 0; p < pieces.Length; p++)
{
entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
entry = currentDirectory.FirstOrDefault(
t => t.Key.Equals(pieces[p], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -532,8 +533,10 @@ public sealed partial class ISO9660
{
KeyValuePair<string, DecodedDirectoryEntry> transTblEntry =
entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
(e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl" ||
e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl;1"));
(e.Value.Filename.Equals("trans.tbl",
StringComparison.CurrentCultureIgnoreCase) ||
e.Value.Filename.Equals("trans.tbl;1",
StringComparison.CurrentCultureIgnoreCase)));
if(transTblEntry.Value == null)
return;
@@ -576,9 +579,10 @@ public sealed partial class ISO9660
KeyValuePair<string, DecodedDirectoryEntry> originalEntry =
entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
(e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == originalName ||
e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
originalNameWithVersion));
(e.Value.Filename.Equals(originalName,
StringComparison.CurrentCultureIgnoreCase) ||
e.Value.Filename.Equals(originalNameWithVersion,
StringComparison.CurrentCultureIgnoreCase)));
originalEntry.Value.Filename = newName;
entries.Remove(originalEntry.Key);
@@ -1119,9 +1123,7 @@ public sealed partial class ISO9660
while(currentPiece < pieces.Length)
{
PathTableEntryInternal currentEntry = _pathTable.FirstOrDefault(p => p.Parent == currentParent &&
p.Name.ToLower(CultureInfo.
CurrentUICulture) ==
pieces[currentPiece]);
p.Name.Equals(pieces[currentPiece], StringComparison.CurrentCultureIgnoreCase));
if(currentEntry is null)
break;

5
Aaru.Filesystems/ISO9660/File.cs
View File

@@ -500,14 +500,15 @@ public sealed partial class ISO9660
return ErrorNumber.InvalidArgument;
KeyValuePair<string, DecodedDirectoryEntry> dirent =
parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
parent.FirstOrDefault(t => t.Key.Equals(pieces[^1], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
{
if(!_joliet &&
!pieces[^1].EndsWith(";1", StringComparison.Ordinal))
{
dirent = parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1] + ";1");
dirent = parent.FirstOrDefault(
t => t.Key.Equals(pieces[^1] + ";1", StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
return ErrorNumber.NoSuchFile;

5
Aaru.Filesystems/Opera/Dir.cs
View File

@@ -80,7 +80,7 @@ public sealed partial class OperaFS
string[] pieces = cutPath.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
KeyValuePair<string, DirectoryEntryWithPointers> entry =
_rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
_rootDirectoryCache.FirstOrDefault(t => t.Key.Equals(pieces[0], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;
@@ -94,7 +94,8 @@ public sealed partial class OperaFS
for(var p = 0; p < pieces.Length; p++)
{
entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
entry = currentDirectory.FirstOrDefault(
t => t.Key.Equals(pieces[p], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(entry.Key))
return ErrorNumber.NoSuchFile;

2
Aaru.Filesystems/Opera/File.cs
View File

@@ -229,7 +229,7 @@ public sealed partial class OperaFS
return ErrorNumber.InvalidArgument;
KeyValuePair<string, DirectoryEntryWithPointers> dirent =
parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
parent.FirstOrDefault(t => t.Key.Equals(pieces[^1], StringComparison.CurrentCultureIgnoreCase));
if(string.IsNullOrEmpty(dirent.Key))
return ErrorNumber.NoSuchFile;