Skip to content

Commit 466689d

Browse files
committed
Clean up holdover logic
1 parent 5b0bf2e commit 466689d

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

BinaryObjectScanner/FileType/Executable.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@ protected IDictionary<IContentCheck, string> RunContentChecks(string? file, Stre
7474
/// Handle a single file based on all executable check implementations
7575
/// </summary>
7676
/// <param name="file">Name of the source file of the executable, for tracking</param>
77-
/// <param name="exe">Executable to scan</param>
7877
/// <param name="checks">Set of checks to use</param>
79-
/// <param name="scanner">Scanner for handling recursive protections</param>
8078
/// <param name="includeDebug">True to include debug data, false otherwise</param>
8179
/// <returns>Set of protections in file, empty on error</returns>
82-
protected IDictionary<U, string> RunExecutableChecks<U>(string file, T exe, U[] checks, bool includeDebug)
80+
protected IDictionary<U, string> RunExecutableChecks<U>(string file, U[] checks, bool includeDebug)
8381
where U : IExecutableCheck<T>
8482
{
8583
// Create the output dictionary
@@ -89,7 +87,7 @@ protected IDictionary<U, string> RunExecutableChecks<U>(string file, T exe, U[]
8987
checks.IterateWithAction(checkClass =>
9088
{
9189
// Get the protection for the class, if possible
92-
var protection = checkClass.CheckExecutable(file, exe, includeDebug);
90+
var protection = checkClass.CheckExecutable(file, _wrapper, includeDebug);
9391
if (string.IsNullOrEmpty(protection))
9492
return;
9593

BinaryObjectScanner/FileType/LinearExecutable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public LinearExecutable(SabreTools.Serialization.Wrappers.LinearExecutable wrapp
2727

2828
// Standard checks
2929
var subProtections
30-
= RunExecutableChecks(file, _wrapper, StaticChecks.LinearExecutableCheckClasses, includeDebug);
30+
= RunExecutableChecks(file, StaticChecks.LinearExecutableCheckClasses, includeDebug);
3131
protections.Append(file, subProtections.Values);
3232

3333
// If there are no protections

BinaryObjectScanner/FileType/MSDOS.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public MSDOS(SabreTools.Serialization.Wrappers.MSDOS wrapper) : base(wrapper) {
2727

2828
// Standard checks
2929
var subProtections
30-
= RunExecutableChecks(file, _wrapper, StaticChecks.MSDOSExecutableCheckClasses, includeDebug);
30+
= RunExecutableChecks(file, StaticChecks.MSDOSExecutableCheckClasses, includeDebug);
3131
protections.Append(file, subProtections.Values);
3232

3333
// If there are no protections

BinaryObjectScanner/FileType/NewExecutable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public NewExecutable(SabreTools.Serialization.Wrappers.NewExecutable wrapper) :
2727

2828
// Standard checks
2929
var subProtections
30-
= RunExecutableChecks(file, _wrapper, StaticChecks.NewExecutableCheckClasses, includeDebug);
30+
= RunExecutableChecks(file, StaticChecks.NewExecutableCheckClasses, includeDebug);
3131
protections.Append(file, subProtections.Values);
3232

3333
// If there are no protections

BinaryObjectScanner/FileType/PortableExecutable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public PortableExecutable(SabreTools.Serialization.Wrappers.PortableExecutable w
2727

2828
// Standard checks
2929
var subProtections
30-
= RunExecutableChecks(file, _wrapper, StaticChecks.PortableExecutableCheckClasses, includeDebug);
30+
= RunExecutableChecks(file, StaticChecks.PortableExecutableCheckClasses, includeDebug);
3131
protections.Append(file, subProtections.Values);
3232

3333
// If there are no protections

0 commit comments

Comments
 (0)