From 2242fc6371d3f9abcf3929212ab180b7ee3143e1 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 18 Aug 2020 21:35:39 -0700 Subject: [PATCH] Miscellaneous code style cleanup --- build/Build.cs | 2 +- src/LibHac/FsSrv/FileSystemProxy.cs | 2 +- src/LibHac/FsSystem/BucketTree.cs | 2 +- src/LibHac/FsSystem/BucketTreeBuilder.cs | 6 +++--- src/LibHac/FsSystem/CachedStorage.cs | 6 ------ src/LibHac/ReferenceCountedDisposable.cs | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 95c88582..69106473 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -383,7 +383,7 @@ namespace LibHacBuild DotNetPublish(publishSettings); - if (EnvironmentInfo.IsUnix && !Untrimmed && !NoReflection) + if (EnvironmentInfo.IsUnix && !Untrimmed) { File.Copy(CliNativeExe, CliNativeExe + "_unstripped", true); ProcessTasks.StartProcess("strip", CliNativeExe).AssertZeroExitCode(); diff --git a/src/LibHac/FsSrv/FileSystemProxy.cs b/src/LibHac/FsSrv/FileSystemProxy.cs index c707e450..939aac2e 100644 --- a/src/LibHac/FsSrv/FileSystemProxy.cs +++ b/src/LibHac/FsSrv/FileSystemProxy.cs @@ -21,7 +21,7 @@ namespace LibHac.FsSrv public long SaveDataSize { get; private set; } public long SaveDataJournalSize { get; private set; } - public FsPath SaveDataRootPath { get; } = default; + public FsPath SaveDataRootPath { get; } public bool AutoCreateSaveData { get; private set; } internal FileSystemProxy(FileSystemProxyCore fsProxyCore, FileSystemServer fsServer) diff --git a/src/LibHac/FsSystem/BucketTree.cs b/src/LibHac/FsSystem/BucketTree.cs index dd877d6c..a6ae4ab1 100644 --- a/src/LibHac/FsSystem/BucketTree.cs +++ b/src/LibHac/FsSystem/BucketTree.cs @@ -22,7 +22,7 @@ namespace LibHac.FsSystem private SubStorage NodeStorage { get; set; } private SubStorage EntryStorage { get; set; } - private NodeBuffer _nodeL1 = new NodeBuffer(); + private NodeBuffer _nodeL1; private long NodeSize { get; set; } private long EntrySize { get; set; } diff --git a/src/LibHac/FsSystem/BucketTreeBuilder.cs b/src/LibHac/FsSystem/BucketTreeBuilder.cs index 34385864..68dc975c 100644 --- a/src/LibHac/FsSystem/BucketTreeBuilder.cs +++ b/src/LibHac/FsSystem/BucketTreeBuilder.cs @@ -14,9 +14,9 @@ namespace LibHac.FsSystem private SubStorage NodeStorage { get; set; } private SubStorage EntryStorage { get; set; } - private NodeBuffer _l1Node = new NodeBuffer(); - private NodeBuffer _l2Node = new NodeBuffer(); - private NodeBuffer _entrySet = new NodeBuffer(); + private NodeBuffer _l1Node; + private NodeBuffer _l2Node; + private NodeBuffer _entrySet; private int NodeSize { get; set; } private int EntrySize { get; set; } diff --git a/src/LibHac/FsSystem/CachedStorage.cs b/src/LibHac/FsSystem/CachedStorage.cs index 614d50f8..945a82b3 100644 --- a/src/LibHac/FsSystem/CachedStorage.cs +++ b/src/LibHac/FsSystem/CachedStorage.cs @@ -145,12 +145,6 @@ namespace LibHac.FsSystem Blocks.AddFirst(node); } - // If a supposedly active block is null, something's really wrong - if (node is null) - { - throw new NullReferenceException("CachedStorage cache block is unexpectedly null."); - } - return node.Value; } diff --git a/src/LibHac/ReferenceCountedDisposable.cs b/src/LibHac/ReferenceCountedDisposable.cs index ca2b74ed..4e820194 100644 --- a/src/LibHac/ReferenceCountedDisposable.cs +++ b/src/LibHac/ReferenceCountedDisposable.cs @@ -336,7 +336,7 @@ namespace LibHac } T? instance = reference._instance; - var referenceCount = reference._boxedReferenceCount; + StrongBox referenceCount = reference._boxedReferenceCount; if (instance == null) { // The specified reference is already not valid. This case is supported by WeakReference (not