From 013d18a426eea91dd3495f06c32fc711dd1ff9cd Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 31 Jul 2025 13:23:45 -0400 Subject: [PATCH] Better file descriptor method --- .../Wrappers/InstallShieldCabinet.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs index c6514e78..1d77b590 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs @@ -361,13 +361,13 @@ namespace SabreTools.Serialization.Wrappers /// Get the file descriptor at a given index, if possible /// /// Verifies the file descriptor flags before returning - public FileDescriptor? GetFileDescriptorWithVerification(int index, out string? error) + public bool TryGetFileDescriptor(int index, out FileDescriptor? fileDescriptor) { - var fileDescriptor = GetFileDescriptor(index); + fileDescriptor = GetFileDescriptor(index); if (fileDescriptor == null) { - error = $"Failed to get file descriptor for file {index}"; - return null; + Console.Error.WriteLine($"Failed to get file descriptor for file {index}"); + return false; } #if NET20 || NET35 @@ -376,12 +376,11 @@ namespace SabreTools.Serialization.Wrappers if (fileDescriptor.Flags.HasFlag(FileFlags.FILE_INVALID) || fileDescriptor.DataOffset == 0) #endif { - error = $"File at {index} is marked as invalid"; - return null; + Console.Error.WriteLine($"File at {index} is marked as invalid"); + return false; } - error = null; - return fileDescriptor; + return true; } ///