From 5d9c99508dd9406c738de01a1ae15d329de6ff6e Mon Sep 17 00:00:00 2001
From: Adam Hathcock <adam@disputed.io>
Date: Tue, 23 Apr 2024 15:08:50 +0100
Subject: [PATCH] fmt

---
 src/SharpCompress/Common/Rar/Headers/FileHeader.cs     | 10 +++++-----
 .../Common/Rar/Headers/RarHeaderFactory.cs             |  9 +++++++--
 src/SharpCompress/NotNullExtensions.cs                 |  5 +++--
 src/SharpCompress/Readers/AbstractReader.cs            |  3 ++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/SharpCompress/Common/Rar/Headers/FileHeader.cs b/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
index d1bf7b8a..0aa9fc0d 100644
--- a/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
+++ b/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
@@ -344,11 +344,11 @@ private void ReadFromReaderV4(MarkingBinaryReader reader)
                 if (FileLastModifiedTime is not null)
                 {
                     FileLastModifiedTime = ProcessExtendedTimeV4(
-                                                                 extendedFlags,
-                                                                 FileLastModifiedTime,
-                                                                 reader,
-                                                                 0
-                                                                );
+                        extendedFlags,
+                        FileLastModifiedTime,
+                        reader,
+                        0
+                    );
                 }
 
                 FileCreatedTime = ProcessExtendedTimeV4(extendedFlags, null, reader, 1);
diff --git a/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs b/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
index a702c4d1..902e595f 100644
--- a/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
+++ b/src/SharpCompress/Common/Rar/Headers/RarHeaderFactory.cs
@@ -158,9 +158,14 @@ public IEnumerable<IRarHeader> ReadHeaders(Stream stream)
                             {
                                 fh.PackedStream = new RarCryptoWrapper(
                                     ms,
-                                    fh.R4Salt is null ? fh.Rar5CryptoInfo.NotNull().Salt : fh.R4Salt,
                                     fh.R4Salt is null
-                                        ? new CryptKey5(Options.Password, fh.Rar5CryptoInfo.NotNull())
+                                        ? fh.Rar5CryptoInfo.NotNull().Salt
+                                        : fh.R4Salt,
+                                    fh.R4Salt is null
+                                        ? new CryptKey5(
+                                            Options.Password,
+                                            fh.Rar5CryptoInfo.NotNull()
+                                        )
                                         : new CryptKey3(Options.Password)
                                 );
                             }
diff --git a/src/SharpCompress/NotNullExtensions.cs b/src/SharpCompress/NotNullExtensions.cs
index c8ae4762..956a4fde 100644
--- a/src/SharpCompress/NotNullExtensions.cs
+++ b/src/SharpCompress/NotNullExtensions.cs
@@ -11,6 +11,7 @@ public static class NotNullExtensions
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> Empty<T>(this IEnumerable<T>? source) =>
         source ?? Enumerable.Empty<T>();
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static IEnumerable<T> Empty<T>(this T? source)
     {
@@ -22,7 +23,7 @@ public static IEnumerable<T> Empty<T>(this T? source)
     }
 
 #if NETFRAMEWORK || NETSTANDARD
-[MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T NotNull<T>(this T? obj, string? message = null)
         where T : class
     {
@@ -33,7 +34,7 @@ public static T NotNull<T>(this T? obj, string? message = null)
         return obj;
     }
 
-[MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static T NotNull<T>(this T? obj, string? message = null)
         where T : struct
     {
diff --git a/src/SharpCompress/Readers/AbstractReader.cs b/src/SharpCompress/Readers/AbstractReader.cs
index c99c3966..da6279a9 100644
--- a/src/SharpCompress/Readers/AbstractReader.cs
+++ b/src/SharpCompress/Readers/AbstractReader.cs
@@ -192,7 +192,8 @@ public EntryStream OpenEntryStream()
     /// <summary>
     /// Retains a reference to the entry stream, so we can check whether it completed later.
     /// </summary>
-    protected EntryStream CreateEntryStream(Stream? decompressed) => new(this, decompressed.NotNull());
+    protected EntryStream CreateEntryStream(Stream? decompressed) =>
+        new(this, decompressed.NotNull());
 
     protected virtual EntryStream GetEntryStream() =>
         CreateEntryStream(Entry.Parts.First().GetCompressedStream());