From 90fc16b888c758c771ae296116c4527988faba7c Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 12 Nov 2024 16:29:47 -0500 Subject: [PATCH] Reduce more Linq steps --- SabreTools.Serialization/Deserializers/NewExecutable.cs | 3 +-- .../Deserializers/PortableExecutable.cs | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/SabreTools.Serialization/Deserializers/NewExecutable.cs b/SabreTools.Serialization/Deserializers/NewExecutable.cs index 5209d944..c29776f6 100644 --- a/SabreTools.Serialization/Deserializers/NewExecutable.cs +++ b/SabreTools.Serialization/Deserializers/NewExecutable.cs @@ -304,8 +304,7 @@ namespace SabreTools.Serialization.Deserializers // Get the full list of unique string offsets var stringOffsets = resourceTable.ResourceTypes - .Where(rt => rt != null) - .Where(rt => !rt!.IsIntegerType() && rt!.TypeID != 0) + .Where(rt => rt != null && rt.TypeID != 0 && !rt.IsIntegerType()) .Select(rt => rt!.TypeID) .Union(resourceTable.ResourceTypes .Where(rt => rt != null && rt!.TypeID != 0) diff --git a/SabreTools.Serialization/Deserializers/PortableExecutable.cs b/SabreTools.Serialization/Deserializers/PortableExecutable.cs index 95de32d3..1bc36ce2 100644 --- a/SabreTools.Serialization/Deserializers/PortableExecutable.cs +++ b/SabreTools.Serialization/Deserializers/PortableExecutable.cs @@ -1053,8 +1053,7 @@ namespace SabreTools.Serialization.Deserializers if (importTable.ImportLookupTables != null && importLookupTables.Count > 0) { var addresses = importTable.ImportLookupTables - .Where(kvp => kvp.Value != null) - .SelectMany(kvp => kvp.Value!) + .SelectMany(kvp => kvp.Value ?? []) .Where(ilte => ilte != null) .Select(ilte => (int)ilte!.HintNameTableRVA.ConvertVirtualAddress(sections)); hintNameTableEntryAddresses.AddRange(addresses); @@ -1064,8 +1063,7 @@ namespace SabreTools.Serialization.Deserializers if (importTable.ImportAddressTables != null && importTable.ImportAddressTables.Count > 0) { var addresses = importTable.ImportAddressTables - .Where(kvp => kvp.Value != null) - .SelectMany(kvp => kvp.Value!) + .SelectMany(kvp => kvp.Value ?? []) .Where(iate => iate != null) .Select(iate => (int)iate!.HintNameTableRVA.ConvertVirtualAddress(sections)); hintNameTableEntryAddresses.AddRange(addresses);