Skip to content

Commit 013d18a

Browse files
committed
Better file descriptor method
1 parent e94e279 commit 013d18a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

SabreTools.Serialization/Wrappers/InstallShieldCabinet.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,13 +361,13 @@ public ulong GetExpandedFileSize(int index)
361361
/// Get the file descriptor at a given index, if possible
362362
/// </summary>
363363
/// <remarks>Verifies the file descriptor flags before returning</remarks>
364-
public FileDescriptor? GetFileDescriptorWithVerification(int index, out string? error)
364+
public bool TryGetFileDescriptor(int index, out FileDescriptor? fileDescriptor)
365365
{
366-
var fileDescriptor = GetFileDescriptor(index);
366+
fileDescriptor = GetFileDescriptor(index);
367367
if (fileDescriptor == null)
368368
{
369-
error = $"Failed to get file descriptor for file {index}";
370-
return null;
369+
Console.Error.WriteLine($"Failed to get file descriptor for file {index}");
370+
return false;
371371
}
372372

373373
#if NET20 || NET35
@@ -376,12 +376,11 @@ public ulong GetExpandedFileSize(int index)
376376
if (fileDescriptor.Flags.HasFlag(FileFlags.FILE_INVALID) || fileDescriptor.DataOffset == 0)
377377
#endif
378378
{
379-
error = $"File at {index} is marked as invalid";
380-
return null;
379+
Console.Error.WriteLine($"File at {index} is marked as invalid");
380+
return false;
381381
}
382382

383-
error = null;
384-
return fileDescriptor;
383+
return true;
385384
}
386385

387386
/// <summary>

0 commit comments

Comments
 (0)