From a895700757665a146cf0356eb7e6e73046bce50a Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 21 Dec 2017 17:45:39 +0000 Subject: [PATCH] REFACTOR: Replace if statement with null-propagating code. --- DiscImageChef.Core/Logging/DumpLog.cs | 8 +++----- DiscImageChef.Decoders/SCSI/Modes/00_SFF.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/01.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/01_MMC.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/02.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/03.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/04.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/05.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/06.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/07.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/07_MMC.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/08.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/0A.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/0B.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/0D.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/0E.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/0F.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/10.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/10_SSC.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/11.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/1A.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/1B.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/1C.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/1C_SFF.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/1D.cs | 6 ++---- .../SCSI/Modes/21_Certance.cs | 6 ++---- .../SCSI/Modes/22_Certance.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/24_IBM.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/2A.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/2F_IBM.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/30_Apple.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/3B_HP.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/3C_HP.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/3D_HP.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/3D_IBM.cs | 6 ++---- .../SCSI/Modes/3E_Fujitsu.cs | 6 ++---- DiscImageChef.Decoders/SCSI/Modes/3E_HP.cs | 6 ++---- DiscImageChef.DiscImages/DART.cs | 19 ++++++++----------- DiscImageChef.Filters/BZip2.cs | 5 ++--- DiscImageChef.Filters/GZip.cs | 5 ++--- DiscImageChef.Filters/LZip.cs | 5 ++--- DiscImageChef.Filters/XZ.cs | 5 ++--- 42 files changed, 91 insertions(+), 172 deletions(-) diff --git a/DiscImageChef.Core/Logging/DumpLog.cs b/DiscImageChef.Core/Logging/DumpLog.cs index 6c36bfd7..b6590149 100644 --- a/DiscImageChef.Core/Logging/DumpLog.cs +++ b/DiscImageChef.Core/Logging/DumpLog.cs @@ -124,11 +124,9 @@ namespace DiscImageChef.Core.Logging public void Close() { - if(logSw == null) return; - - logSw.WriteLine("######################################################"); - logSw.WriteLine("End logging at {0}", DateTime.Now); - logSw.Close(); + logSw?.WriteLine("######################################################"); + logSw?.WriteLine("End logging at {0}", DateTime.Now); + logSw?.Close(); } } } \ No newline at end of file diff --git a/DiscImageChef.Decoders/SCSI/Modes/00_SFF.cs b/DiscImageChef.Decoders/SCSI/Modes/00_SFF.cs index ff2f6b99..fde4894d 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/00_SFF.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/00_SFF.cs @@ -68,11 +68,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_00_SFF? DecodeModePage_00_SFF(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x00) return null; + if((pageResponse?[0] & 0x3F) != 0x00) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/01.cs b/DiscImageChef.Decoders/SCSI/Modes/01.cs index 8b2d88a1..f54424c6 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/01.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/01.cs @@ -113,11 +113,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_01? DecodeModePage_01(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x01) return null; + if((pageResponse?[0] & 0x3F) != 0x01) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/01_MMC.cs b/DiscImageChef.Decoders/SCSI/Modes/01_MMC.cs index 4e2e373d..affb08ca 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/01_MMC.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/01_MMC.cs @@ -69,11 +69,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_01_MMC? DecodeModePage_01_MMC(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x01) return null; + if((pageResponse?[0] & 0x3F) != 0x01) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/02.cs b/DiscImageChef.Decoders/SCSI/Modes/02.cs index 615dec57..94ae2bbc 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/02.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/02.cs @@ -97,11 +97,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_02? DecodeModePage_02(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x02) return null; + if((pageResponse?[0] & 0x3F) != 0x02) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/03.cs b/DiscImageChef.Decoders/SCSI/Modes/03.cs index 6a657c3e..f88b289c 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/03.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/03.cs @@ -105,11 +105,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_03? DecodeModePage_03(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x03) return null; + if((pageResponse?[0] & 0x3F) != 0x03) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/04.cs b/DiscImageChef.Decoders/SCSI/Modes/04.cs index 71aac7e7..bb7edbb0 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/04.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/04.cs @@ -88,11 +88,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_04? DecodeModePage_04(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x04) return null; + if((pageResponse?[0] & 0x3F) != 0x04) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/05.cs b/DiscImageChef.Decoders/SCSI/Modes/05.cs index 87b66633..6d0e9e1c 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/05.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/05.cs @@ -153,11 +153,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_05? DecodeModePage_05(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x05) return null; + if((pageResponse?[0] & 0x3F) != 0x05) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/06.cs b/DiscImageChef.Decoders/SCSI/Modes/06.cs index 3b8d187a..1dcc5c00 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/06.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/06.cs @@ -56,11 +56,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_06? DecodeModePage_06(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x06) return null; + if((pageResponse?[0] & 0x3F) != 0x06) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/07.cs b/DiscImageChef.Decoders/SCSI/Modes/07.cs index fdf85de3..efba1ae2 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/07.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/07.cs @@ -80,11 +80,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_07? DecodeModePage_07(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x07) return null; + if((pageResponse?[0] & 0x3F) != 0x07) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/07_MMC.cs b/DiscImageChef.Decoders/SCSI/Modes/07_MMC.cs index 550592ab..50268973 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/07_MMC.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/07_MMC.cs @@ -60,11 +60,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_07_MMC? DecodeModePage_07_MMC(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x07) return null; + if((pageResponse?[0] & 0x3F) != 0x07) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/08.cs b/DiscImageChef.Decoders/SCSI/Modes/08.cs index bdf36830..ae73cbd5 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/08.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/08.cs @@ -136,11 +136,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_08? DecodeModePage_08(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x08) return null; + if((pageResponse?[0] & 0x3F) != 0x08) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/0A.cs b/DiscImageChef.Decoders/SCSI/Modes/0A.cs index ca8637f0..20323f31 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/0A.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/0A.cs @@ -161,11 +161,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_0A? DecodeModePage_0A(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x0A) return null; + if((pageResponse?[0] & 0x3F) != 0x0A) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/0B.cs b/DiscImageChef.Decoders/SCSI/Modes/0B.cs index d69f06ed..491e68bc 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/0B.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/0B.cs @@ -56,11 +56,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_0B? DecodeModePage_0B(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x0B) return null; + if((pageResponse?[0] & 0x3F) != 0x0B) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/0D.cs b/DiscImageChef.Decoders/SCSI/Modes/0D.cs index c269c1d9..545b374a 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/0D.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/0D.cs @@ -64,11 +64,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_0D? DecodeModePage_0D(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x0D) return null; + if((pageResponse?[0] & 0x3F) != 0x0D) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/0E.cs b/DiscImageChef.Decoders/SCSI/Modes/0E.cs index 1a217234..d698c8ff 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/0E.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/0E.cs @@ -104,11 +104,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_0E? DecodeModePage_0E(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x0E) return null; + if((pageResponse?[0] & 0x3F) != 0x0E) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/0F.cs b/DiscImageChef.Decoders/SCSI/Modes/0F.cs index a2484f6e..a86344ef 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/0F.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/0F.cs @@ -76,11 +76,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_0F? DecodeModePage_0F(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x0F) return null; + if((pageResponse?[0] & 0x3F) != 0x0F) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/10.cs b/DiscImageChef.Decoders/SCSI/Modes/10.cs index 7cf39ee9..b450a628 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/10.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/10.cs @@ -72,11 +72,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_10? DecodeModePage_10(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x10) return null; + if((pageResponse?[0] & 0x3F) != 0x10) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/10_SSC.cs b/DiscImageChef.Decoders/SCSI/Modes/10_SSC.cs index 9fda7a3c..12ebb3a7 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/10_SSC.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/10_SSC.cs @@ -162,11 +162,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_10_SSC? DecodeModePage_10_SSC(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x10) return null; + if((pageResponse?[0] & 0x3F) != 0x10) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/11.cs b/DiscImageChef.Decoders/SCSI/Modes/11.cs index 503ee8e1..089c0cb7 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/11.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/11.cs @@ -128,11 +128,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_11? DecodeModePage_11(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x11) return null; + if((pageResponse?[0] & 0x3F) != 0x11) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/1A.cs b/DiscImageChef.Decoders/SCSI/Modes/1A.cs index 83676328..69dd53da 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/1A.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/1A.cs @@ -101,11 +101,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_1A? DecodeModePage_1A(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x1A) return null; + if((pageResponse?[0] & 0x3F) != 0x1A) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/1B.cs b/DiscImageChef.Decoders/SCSI/Modes/1B.cs index fe986ea5..9a7f02eb 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/1B.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/1B.cs @@ -72,11 +72,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_1B? DecodeModePage_1B(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x1B) return null; + if((pageResponse?[0] & 0x3F) != 0x1B) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/1C.cs b/DiscImageChef.Decoders/SCSI/Modes/1C.cs index 155a6752..80e93494 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/1C.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/1C.cs @@ -94,11 +94,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_1C? DecodeModePage_1C(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x1C) return null; + if((pageResponse?[0] & 0x3F) != 0x1C) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/1C_SFF.cs b/DiscImageChef.Decoders/SCSI/Modes/1C_SFF.cs index d293fef7..8cee682c 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/1C_SFF.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/1C_SFF.cs @@ -64,11 +64,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_1C_SFF? DecodeModePage_1C_SFF(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x1C) return null; + if((pageResponse?[0] & 0x3F) != 0x1C) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/1D.cs b/DiscImageChef.Decoders/SCSI/Modes/1D.cs index 7d5d27f7..72a69bba 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/1D.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/1D.cs @@ -50,11 +50,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_1D? DecodeModePage_1D(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x1D) return null; + if((pageResponse?[0] & 0x3F) != 0x1D) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/21_Certance.cs b/DiscImageChef.Decoders/SCSI/Modes/21_Certance.cs index 6d583aac..e11d9316 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/21_Certance.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/21_Certance.cs @@ -55,11 +55,9 @@ namespace DiscImageChef.Decoders.SCSI public static Certance_ModePage_21? DecodeCertanceModePage_21(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x21) return null; + if((pageResponse?[0] & 0x3F) != 0x21) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/22_Certance.cs b/DiscImageChef.Decoders/SCSI/Modes/22_Certance.cs index 0ed9ccac..bcd7b549 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/22_Certance.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/22_Certance.cs @@ -58,11 +58,9 @@ namespace DiscImageChef.Decoders.SCSI public static Certance_ModePage_22? DecodeCertanceModePage_22(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x22) return null; + if((pageResponse?[0] & 0x3F) != 0x22) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/24_IBM.cs b/DiscImageChef.Decoders/SCSI/Modes/24_IBM.cs index 3a11d61d..683a0c4e 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/24_IBM.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/24_IBM.cs @@ -51,11 +51,9 @@ namespace DiscImageChef.Decoders.SCSI public static IBM_ModePage_24? DecodeIBMModePage_24(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x24) return null; + if((pageResponse?[0] & 0x3F) != 0x24) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/2A.cs b/DiscImageChef.Decoders/SCSI/Modes/2A.cs index bbed1b6e..8ea416d5 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/2A.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/2A.cs @@ -186,11 +186,9 @@ namespace DiscImageChef.Decoders.SCSI public static ModePage_2A? DecodeModePage_2A(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x2A) return null; + if((pageResponse?[0] & 0x3F) != 0x2A) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/2F_IBM.cs b/DiscImageChef.Decoders/SCSI/Modes/2F_IBM.cs index 560390fe..1d83c5ef 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/2F_IBM.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/2F_IBM.cs @@ -58,11 +58,9 @@ namespace DiscImageChef.Decoders.SCSI public static IBM_ModePage_2F? DecodeIBMModePage_2F(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x2F) return null; + if((pageResponse?[0] & 0x3F) != 0x2F) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/30_Apple.cs b/DiscImageChef.Decoders/SCSI/Modes/30_Apple.cs index 988e17f3..cd71298c 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/30_Apple.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/30_Apple.cs @@ -46,11 +46,9 @@ namespace DiscImageChef.Decoders.SCSI public static bool IsAppleModePage_30(byte[] pageResponse) { - if(pageResponse == null) return false; + if((pageResponse?[0] & 0x40) == 0x40) return false; - if((pageResponse[0] & 0x40) == 0x40) return false; - - if((pageResponse[0] & 0x3F) != 0x30) return false; + if((pageResponse?[0] & 0x3F) != 0x30) return false; if(pageResponse[1] + 2 != pageResponse.Length) return false; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3B_HP.cs b/DiscImageChef.Decoders/SCSI/Modes/3B_HP.cs index 7c5d6fa4..83a11283 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3B_HP.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3B_HP.cs @@ -50,11 +50,9 @@ namespace DiscImageChef.Decoders.SCSI public static HP_ModePage_3B? DecodeHPModePage_3B(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3B) return null; + if((pageResponse?[0] & 0x3F) != 0x3B) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3C_HP.cs b/DiscImageChef.Decoders/SCSI/Modes/3C_HP.cs index 279dd5e2..2d15f9b1 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3C_HP.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3C_HP.cs @@ -60,11 +60,9 @@ namespace DiscImageChef.Decoders.SCSI public static HP_ModePage_3C? DecodeHPModePage_3C(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3C) return null; + if((pageResponse?[0] & 0x3F) != 0x3C) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3D_HP.cs b/DiscImageChef.Decoders/SCSI/Modes/3D_HP.cs index 5a6e374a..24291cb7 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3D_HP.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3D_HP.cs @@ -48,11 +48,9 @@ namespace DiscImageChef.Decoders.SCSI public static HP_ModePage_3D? DecodeHPModePage_3D(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3D) return null; + if((pageResponse?[0] & 0x3F) != 0x3D) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3D_IBM.cs b/DiscImageChef.Decoders/SCSI/Modes/3D_IBM.cs index a2825e07..4a722e12 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3D_IBM.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3D_IBM.cs @@ -48,11 +48,9 @@ namespace DiscImageChef.Decoders.SCSI public static IBM_ModePage_3D? DecodeIBMModePage_3D(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3D) return null; + if((pageResponse?[0] & 0x3F) != 0x3D) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3E_Fujitsu.cs b/DiscImageChef.Decoders/SCSI/Modes/3E_Fujitsu.cs index 830a9836..93cce901 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3E_Fujitsu.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3E_Fujitsu.cs @@ -84,11 +84,9 @@ namespace DiscImageChef.Decoders.SCSI public static Fujitsu_ModePage_3E? DecodeFujitsuModePage_3E(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3E) return null; + if((pageResponse?[0] & 0x3F) != 0x3E) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.Decoders/SCSI/Modes/3E_HP.cs b/DiscImageChef.Decoders/SCSI/Modes/3E_HP.cs index 1ebc707b..da5c7743 100644 --- a/DiscImageChef.Decoders/SCSI/Modes/3E_HP.cs +++ b/DiscImageChef.Decoders/SCSI/Modes/3E_HP.cs @@ -49,11 +49,9 @@ namespace DiscImageChef.Decoders.SCSI public static HP_ModePage_3E? DecodeHPModePage_3E(byte[] pageResponse) { - if(pageResponse == null) return null; + if((pageResponse?[0] & 0x40) == 0x40) return null; - if((pageResponse[0] & 0x40) == 0x40) return null; - - if((pageResponse[0] & 0x3F) != 0x3E) return null; + if((pageResponse?[0] & 0x3F) != 0x3E) return null; if(pageResponse[1] + 2 != pageResponse.Length) return null; diff --git a/DiscImageChef.DiscImages/DART.cs b/DiscImageChef.DiscImages/DART.cs index f3600574..03b5dac8 100644 --- a/DiscImageChef.DiscImages/DART.cs +++ b/DiscImageChef.DiscImages/DART.cs @@ -359,18 +359,15 @@ namespace DiscImageChef.DiscImages if(rsrcFork.ContainsKey(0x434B534D)) { Resource cksmRsrc = rsrcFork.GetResource(0x434B534D); - if(cksmRsrc != null) + if(cksmRsrc?.ContainsId(1) == true) { - if(cksmRsrc.ContainsId(1)) - { - byte[] tagChk = cksmRsrc.GetResource(1); - tagChecksum = BigEndianBitConverter.ToUInt32(tagChk, 0); - } - if(cksmRsrc.ContainsId(2)) - { - byte[] dataChk = cksmRsrc.GetResource(1); - dataChecksum = BigEndianBitConverter.ToUInt32(dataChk, 0); - } + byte[] tagChk = cksmRsrc.GetResource(1); + tagChecksum = BigEndianBitConverter.ToUInt32(tagChk, 0); + } + if(cksmRsrc?.ContainsId(2) == true) + { + byte[] dataChk = cksmRsrc.GetResource(1); + dataChecksum = BigEndianBitConverter.ToUInt32(dataChk, 0); } } } diff --git a/DiscImageChef.Filters/BZip2.cs b/DiscImageChef.Filters/BZip2.cs index c2c18936..f7038d5f 100644 --- a/DiscImageChef.Filters/BZip2.cs +++ b/DiscImageChef.Filters/BZip2.cs @@ -212,10 +212,9 @@ namespace DiscImageChef.Filters public override string GetFilename() { - if(basePath == null) return null; - if(basePath.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 4); - if(basePath.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 6); return basePath; diff --git a/DiscImageChef.Filters/GZip.cs b/DiscImageChef.Filters/GZip.cs index a440e799..e97d325b 100644 --- a/DiscImageChef.Filters/GZip.cs +++ b/DiscImageChef.Filters/GZip.cs @@ -221,10 +221,9 @@ namespace DiscImageChef.Filters public override string GetFilename() { - if(basePath == null) return null; - if(basePath.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 3); - if(basePath.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 5); return basePath; diff --git a/DiscImageChef.Filters/LZip.cs b/DiscImageChef.Filters/LZip.cs index f82db8e1..e2250778 100644 --- a/DiscImageChef.Filters/LZip.cs +++ b/DiscImageChef.Filters/LZip.cs @@ -195,10 +195,9 @@ namespace DiscImageChef.Filters public override string GetFilename() { - if(basePath == null) return null; - if(basePath.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 3); - if(basePath.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 5); return basePath; diff --git a/DiscImageChef.Filters/XZ.cs b/DiscImageChef.Filters/XZ.cs index 97f68c7c..a88832f1 100644 --- a/DiscImageChef.Filters/XZ.cs +++ b/DiscImageChef.Filters/XZ.cs @@ -237,10 +237,9 @@ namespace DiscImageChef.Filters public override string GetFilename() { - if(basePath == null) return null; - if(basePath.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 3); - if(basePath.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase)) + if(basePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true) return basePath.Substring(0, basePath.Length - 5); return basePath;