From 34a3050e27908bf07d8a1d0da34397129c9c932b Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sat, 20 Sep 2025 17:37:59 -0400 Subject: [PATCH] None of this needs to account for nulls --- BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs | 2 +- BinaryObjectScanner/FileType/BDPlusSVM.cs | 2 +- BinaryObjectScanner/FileType/DetectableBaseT.cs | 5 +---- BinaryObjectScanner/FileType/Executable.cs | 2 +- BinaryObjectScanner/FileType/LinearExecutable.cs | 2 +- BinaryObjectScanner/FileType/MSDOS.cs | 2 +- BinaryObjectScanner/FileType/NewExecutable.cs | 2 +- BinaryObjectScanner/FileType/PLJ.cs | 2 +- BinaryObjectScanner/FileType/PortableExecutable.cs | 2 +- 9 files changed, 9 insertions(+), 12 deletions(-) diff --git a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs index a4afdb3a..f6599e74 100644 --- a/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs +++ b/BinaryObjectScanner/FileType/AACSMediaKeyBlock.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.FileType public class AACSMediaKeyBlock : DetectableBase { /// - public AACSMediaKeyBlock(SabreTools.Serialization.Wrappers.AACSMediaKeyBlock? wrapper) : base(wrapper) { } + public AACSMediaKeyBlock(SabreTools.Serialization.Wrappers.AACSMediaKeyBlock wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/BDPlusSVM.cs b/BinaryObjectScanner/FileType/BDPlusSVM.cs index d5238872..4b6ac987 100644 --- a/BinaryObjectScanner/FileType/BDPlusSVM.cs +++ b/BinaryObjectScanner/FileType/BDPlusSVM.cs @@ -8,7 +8,7 @@ namespace BinaryObjectScanner.FileType public class BDPlusSVM : DetectableBase { /// - public BDPlusSVM(SabreTools.Serialization.Wrappers.BDPlusSVM? wrapper) : base(wrapper) { } + public BDPlusSVM(SabreTools.Serialization.Wrappers.BDPlusSVM wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/DetectableBaseT.cs b/BinaryObjectScanner/FileType/DetectableBaseT.cs index a4da0d63..3050fd31 100644 --- a/BinaryObjectScanner/FileType/DetectableBaseT.cs +++ b/BinaryObjectScanner/FileType/DetectableBaseT.cs @@ -20,11 +20,8 @@ namespace BinaryObjectScanner.FileType #region Constructors - public DetectableBase(T? wrapper) + public DetectableBase(T wrapper) { - if (wrapper == null) - throw new ArgumentNullException(nameof(wrapper)); - _wrapper = wrapper; } diff --git a/BinaryObjectScanner/FileType/Executable.cs b/BinaryObjectScanner/FileType/Executable.cs index 3868253e..f549c75a 100644 --- a/BinaryObjectScanner/FileType/Executable.cs +++ b/BinaryObjectScanner/FileType/Executable.cs @@ -15,7 +15,7 @@ namespace BinaryObjectScanner.FileType where T : WrapperBase { /// - public Executable(T? wrapper) : base(wrapper) { } + public Executable(T wrapper) : base(wrapper) { } #region Check Runners diff --git a/BinaryObjectScanner/FileType/LinearExecutable.cs b/BinaryObjectScanner/FileType/LinearExecutable.cs index 7bb2f860..3e22d086 100644 --- a/BinaryObjectScanner/FileType/LinearExecutable.cs +++ b/BinaryObjectScanner/FileType/LinearExecutable.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.FileType public class LinearExecutable : Executable { /// - public LinearExecutable(SabreTools.Serialization.Wrappers.LinearExecutable? wrapper) : base(wrapper) { } + public LinearExecutable(SabreTools.Serialization.Wrappers.LinearExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/MSDOS.cs b/BinaryObjectScanner/FileType/MSDOS.cs index 56983a06..a686dbed 100644 --- a/BinaryObjectScanner/FileType/MSDOS.cs +++ b/BinaryObjectScanner/FileType/MSDOS.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.FileType public class MSDOS : Executable { /// - public MSDOS(SabreTools.Serialization.Wrappers.MSDOS? wrapper) : base(wrapper) { } + public MSDOS(SabreTools.Serialization.Wrappers.MSDOS wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/NewExecutable.cs b/BinaryObjectScanner/FileType/NewExecutable.cs index 5c74e0e4..96a38c58 100644 --- a/BinaryObjectScanner/FileType/NewExecutable.cs +++ b/BinaryObjectScanner/FileType/NewExecutable.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.FileType public class NewExecutable : Executable { /// - public NewExecutable(SabreTools.Serialization.Wrappers.NewExecutable? wrapper) : base(wrapper) { } + public NewExecutable(SabreTools.Serialization.Wrappers.NewExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/PLJ.cs b/BinaryObjectScanner/FileType/PLJ.cs index 974806d3..353dbe39 100644 --- a/BinaryObjectScanner/FileType/PLJ.cs +++ b/BinaryObjectScanner/FileType/PLJ.cs @@ -9,7 +9,7 @@ namespace BinaryObjectScanner.FileType public class PLJ : DetectableBase { /// - public PLJ(PlayJAudioFile? wrapper) : base(wrapper) { } + public PLJ(PlayJAudioFile wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug) diff --git a/BinaryObjectScanner/FileType/PortableExecutable.cs b/BinaryObjectScanner/FileType/PortableExecutable.cs index 41a9553b..bc1d1c80 100644 --- a/BinaryObjectScanner/FileType/PortableExecutable.cs +++ b/BinaryObjectScanner/FileType/PortableExecutable.cs @@ -10,7 +10,7 @@ namespace BinaryObjectScanner.FileType public class PortableExecutable : Executable { /// - public PortableExecutable(SabreTools.Serialization.Wrappers.PortableExecutable? wrapper) : base(wrapper) { } + public PortableExecutable(SabreTools.Serialization.Wrappers.PortableExecutable wrapper) : base(wrapper) { } /// public override string? Detect(Stream stream, string file, bool includeDebug)