From 064da3645352510864faac4f3cd4a7a84e173414 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 6 Jun 2020 14:18:03 -0700 Subject: [PATCH] Rename old IFile option enums --- src/LibHac/Fs/Accessors/FileAccessor.cs | 8 +++---- src/LibHac/Fs/FileBase.cs | 10 ++++----- src/LibHac/Fs/FileStorage2.cs | 4 ++-- src/LibHac/Fs/FileSystemClient.File.cs | 14 ++++++------ src/LibHac/Fs/FsEnums.cs | 4 ++-- src/LibHac/Fs/IFile.cs | 4 ++-- src/LibHac/Fs/InMemoryFileSystem.cs | 4 ++-- src/LibHac/FsService/FileSystemProxy.cs | 2 +- .../FsService/Impl/MultiCommitManager.cs | 4 ++-- src/LibHac/FsService/SaveDataIndexer.cs | 2 +- src/LibHac/FsSystem/AesXtsDirectory.cs | 4 ++-- src/LibHac/FsSystem/AesXtsFile.cs | 6 ++--- src/LibHac/FsSystem/AesXtsFileSystem.cs | 2 +- src/LibHac/FsSystem/ConcatenationFile.cs | 6 ++--- src/LibHac/FsSystem/DirectorySaveDataFile.cs | 4 ++-- src/LibHac/FsSystem/DirectoryUtils.cs | 4 ++-- src/LibHac/FsSystem/FileSystemExtensions.cs | 4 ++-- src/LibHac/FsSystem/LocalFile.cs | 4 ++-- src/LibHac/FsSystem/NullFile.cs | 4 ++-- src/LibHac/FsSystem/PartitionFile.cs | 6 ++--- .../FsSystem/PartitionFileSystemCore.cs | 4 ++-- src/LibHac/FsSystem/ReadOnlyFile.cs | 4 ++-- src/LibHac/FsSystem/RomFs/RomFsFile.cs | 4 ++-- src/LibHac/FsSystem/Save/SaveDataFile.cs | 6 ++--- src/LibHac/FsSystem/StorageFile.cs | 6 ++--- src/LibHac/FsSystem/StreamFile.cs | 6 ++--- src/LibHac/FsSystem/Utility.cs | 4 ++-- src/LibHac/Kvdb/KeyValueDatabase.cs | 2 +- src/LibHac/Loader/NsoReader.cs | 4 ++-- .../CommittableIFileSystemTests.Commit.cs | 14 ++++++------ .../IFileSystemTests.IFile.Read.cs | 16 +++++++------- .../IFileSystemTests.IFile.Write.cs | 22 +++++++++---------- .../IFileSystemTests.RenameFile.cs | 4 ++-- 33 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/LibHac/Fs/Accessors/FileAccessor.cs b/src/LibHac/Fs/Accessors/FileAccessor.cs index 030a0e8b..b9ba38a5 100644 --- a/src/LibHac/Fs/Accessors/FileAccessor.cs +++ b/src/LibHac/Fs/Accessors/FileAccessor.cs @@ -17,20 +17,20 @@ namespace LibHac.Fs.Accessors OpenMode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { CheckIfDisposed(); return File.Read(out bytesRead, offset, destination, options); } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { CheckIfDisposed(); if (source.Length == 0) { - WriteState = (WriteState)(~options & WriteOption.Flush); + WriteState = (WriteState)(~options & WriteOptionFlag.Flush); return Result.Success; } @@ -39,7 +39,7 @@ namespace LibHac.Fs.Accessors if (rc.IsSuccess()) { - WriteState = (WriteState)(~options & WriteOption.Flush); + WriteState = (WriteState)(~options & WriteOptionFlag.Flush); } return rc; diff --git a/src/LibHac/Fs/FileBase.cs b/src/LibHac/Fs/FileBase.cs index 675ad632..ba21abca 100644 --- a/src/LibHac/Fs/FileBase.cs +++ b/src/LibHac/Fs/FileBase.cs @@ -9,8 +9,8 @@ namespace LibHac.Fs private int _disposedState; private bool IsDisposed => _disposedState != 0; - protected abstract Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options); - protected abstract Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options); + protected abstract Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options); + protected abstract Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options); protected abstract Result FlushImpl(); protected abstract Result SetSizeImpl(long size); protected abstract Result GetSizeImpl(out long size); @@ -21,7 +21,7 @@ namespace LibHac.Fs return ResultFs.NotImplemented.Log(); } - public Result Read(out long bytesRead, long offset, Span destination, ReadOption options) + public Result Read(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -34,13 +34,13 @@ namespace LibHac.Fs return ReadImpl(out bytesRead, offset, destination, options); } - public Result Write(long offset, ReadOnlySpan source, WriteOption options) + public Result Write(long offset, ReadOnlySpan source, WriteOptionFlag options) { if (IsDisposed) return ResultFs.PreconditionViolation.Log(); if (source.Length == 0) { - if (options.HasFlag(WriteOption.Flush)) + if (options.HasFlag(WriteOptionFlag.Flush)) { return FlushImpl(); } diff --git a/src/LibHac/Fs/FileStorage2.cs b/src/LibHac/Fs/FileStorage2.cs index 0a5514b5..91bb5de7 100644 --- a/src/LibHac/Fs/FileStorage2.cs +++ b/src/LibHac/Fs/FileStorage2.cs @@ -50,7 +50,7 @@ namespace LibHac.Fs if (!IsRangeValid(offset, destination.Length, FileSize)) return ResultFs.OutOfRange.Log(); - return BaseFile.Read(out _, offset, destination, ReadOption.None); + return BaseFile.Read(out _, offset, destination, ReadOptionFlag.None); } protected override Result WriteImpl(long offset, ReadOnlySpan source) @@ -64,7 +64,7 @@ namespace LibHac.Fs if (!IsRangeValid(offset, source.Length, FileSize)) return ResultFs.OutOfRange.Log(); - return BaseFile.Write(offset, source, WriteOption.None); + return BaseFile.Write(offset, source, WriteOptionFlag.None); } protected override Result FlushImpl() diff --git a/src/LibHac/Fs/FileSystemClient.File.cs b/src/LibHac/Fs/FileSystemClient.File.cs index 1efe1af6..1524e630 100644 --- a/src/LibHac/Fs/FileSystemClient.File.cs +++ b/src/LibHac/Fs/FileSystemClient.File.cs @@ -6,10 +6,10 @@ namespace LibHac.Fs { public Result ReadFile(FileHandle handle, long offset, Span destination) { - return ReadFile(handle, offset, destination, ReadOption.None); + return ReadFile(handle, offset, destination, ReadOptionFlag.None); } - public Result ReadFile(FileHandle handle, long offset, Span destination, ReadOption option) + public Result ReadFile(FileHandle handle, long offset, Span destination, ReadOptionFlag option) { Result rc = ReadFile(out long bytesRead, handle, offset, destination, option); if (rc.IsFailure()) return rc; @@ -21,10 +21,10 @@ namespace LibHac.Fs public Result ReadFile(out long bytesRead, FileHandle handle, long offset, Span destination) { - return ReadFile(out bytesRead, handle, offset, destination, ReadOption.None); + return ReadFile(out bytesRead, handle, offset, destination, ReadOptionFlag.None); } - public Result ReadFile(out long bytesRead, FileHandle handle, long offset, Span destination, ReadOption option) + public Result ReadFile(out long bytesRead, FileHandle handle, long offset, Span destination, ReadOptionFlag option) { Result rc; @@ -46,10 +46,10 @@ namespace LibHac.Fs public Result WriteFile(FileHandle handle, long offset, ReadOnlySpan source) { - return WriteFile(handle, offset, source, WriteOption.None); + return WriteFile(handle, offset, source, WriteOptionFlag.None); } - public Result WriteFile(FileHandle handle, long offset, ReadOnlySpan source, WriteOption option) + public Result WriteFile(FileHandle handle, long offset, ReadOnlySpan source, WriteOptionFlag option) { Result rc; @@ -59,7 +59,7 @@ namespace LibHac.Fs rc = handle.File.Write(offset, source, option); TimeSpan endTime = Time.GetCurrent(); - string optionString = (option & WriteOption.Flush) == 0 ? "" : $", write_option: {option}"; + string optionString = (option & WriteOptionFlag.Flush) == 0 ? "" : $", write_option: {option}"; OutputAccessLog(rc, startTime, endTime, handle, $", offset: {offset}, size: {source.Length}{optionString}"); } diff --git a/src/LibHac/Fs/FsEnums.cs b/src/LibHac/Fs/FsEnums.cs index 4704a82d..981f5fdd 100644 --- a/src/LibHac/Fs/FsEnums.cs +++ b/src/LibHac/Fs/FsEnums.cs @@ -127,13 +127,13 @@ namespace LibHac.Fs } [Flags] - public enum ReadOption + public enum ReadOptionFlag { None = 0 } [Flags] - public enum WriteOption + public enum WriteOptionFlag { None = 0, Flush = 1 diff --git a/src/LibHac/Fs/IFile.cs b/src/LibHac/Fs/IFile.cs index 29746104..5907fa47 100644 --- a/src/LibHac/Fs/IFile.cs +++ b/src/LibHac/Fs/IFile.cs @@ -28,7 +28,7 @@ namespace LibHac.Fs /// The number of bytes read will be no larger than the length of the buffer. /// Options for reading from the . /// The of the requested operation. - Result Read(out long bytesRead, long offset, Span destination, ReadOption options); + Result Read(out long bytesRead, long offset, Span destination, ReadOptionFlag options); /// /// Writes a sequence of bytes to the current . @@ -37,7 +37,7 @@ namespace LibHac.Fs /// The buffer containing the bytes to be written. /// Options for writing to the . /// The of the requested operation. - Result Write(long offset, ReadOnlySpan source, WriteOption options); + Result Write(long offset, ReadOnlySpan source, WriteOptionFlag options); /// /// Causes any buffered data to be written to the underlying device. diff --git a/src/LibHac/Fs/InMemoryFileSystem.cs b/src/LibHac/Fs/InMemoryFileSystem.cs index 048e5dbf..a238667a 100644 --- a/src/LibHac/Fs/InMemoryFileSystem.cs +++ b/src/LibHac/Fs/InMemoryFileSystem.cs @@ -180,7 +180,7 @@ namespace LibHac.Fs Mode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { if (!Mode.HasFlag(OpenMode.Read)) { @@ -191,7 +191,7 @@ namespace LibHac.Fs return BaseStream.Read(out bytesRead, offset, destination); } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { if (!Mode.HasFlag(OpenMode.Write)) { diff --git a/src/LibHac/FsService/FileSystemProxy.cs b/src/LibHac/FsService/FileSystemProxy.cs index 1725da97..c5c2d629 100644 --- a/src/LibHac/FsService/FileSystemProxy.cs +++ b/src/LibHac/FsService/FileSystemProxy.cs @@ -379,7 +379,7 @@ namespace LibHac.FsService ReadOnlySpan metaFileData = stackalloc byte[0x20]; - rc = metaFile.Write(0, metaFileData, WriteOption.Flush); + rc = metaFile.Write(0, metaFileData, WriteOptionFlag.Flush); if (rc.IsFailure()) return rc; } } diff --git a/src/LibHac/FsService/Impl/MultiCommitManager.cs b/src/LibHac/FsService/Impl/MultiCommitManager.cs index e8a0a31b..97edd7d1 100644 --- a/src/LibHac/FsService/Impl/MultiCommitManager.cs +++ b/src/LibHac/FsService/Impl/MultiCommitManager.cs @@ -207,7 +207,7 @@ namespace LibHac.FsService.Impl _context.CommitCount = commitCount; // Write the initial context to the file - rc = contextFile.Write(0, SpanHelpers.AsByteSpan(ref _context), WriteOption.None); + rc = contextFile.Write(0, SpanHelpers.AsByteSpan(ref _context), WriteOptionFlag.None); if (rc.IsFailure()) return rc; rc = contextFile.Flush(); @@ -232,7 +232,7 @@ namespace LibHac.FsService.Impl _context.State = CommitState.ProvisionallyCommitted; - rc = contextFile.Write(0, SpanHelpers.AsByteSpan(ref _context), WriteOption.None); + rc = contextFile.Write(0, SpanHelpers.AsByteSpan(ref _context), WriteOptionFlag.None); if (rc.IsFailure()) return rc; rc = contextFile.Flush(); diff --git a/src/LibHac/FsService/SaveDataIndexer.cs b/src/LibHac/FsService/SaveDataIndexer.cs index 3d8759b5..f53ff746 100644 --- a/src/LibHac/FsService/SaveDataIndexer.cs +++ b/src/LibHac/FsService/SaveDataIndexer.cs @@ -86,7 +86,7 @@ namespace LibHac.FsService { ulong lastId = LastPublishedId; - rc = FsClient.WriteFile(handle, 0, SpanHelpers.AsByteSpan(ref lastId), WriteOption.None); + rc = FsClient.WriteFile(handle, 0, SpanHelpers.AsByteSpan(ref lastId), WriteOptionFlag.None); if (rc.IsFailure()) return rc; rc = FsClient.FlushFile(handle); diff --git a/src/LibHac/FsSystem/AesXtsDirectory.cs b/src/LibHac/FsSystem/AesXtsDirectory.cs index 8345a24e..4f32f6f2 100644 --- a/src/LibHac/FsSystem/AesXtsDirectory.cs +++ b/src/LibHac/FsSystem/AesXtsDirectory.cs @@ -73,10 +73,10 @@ namespace LibHac.FsSystem long fileSize = 0; long bytesRead; - file.Read(out bytesRead, magicOffset, SpanHelpers.AsByteSpan(ref magic), ReadOption.None); + file.Read(out bytesRead, magicOffset, SpanHelpers.AsByteSpan(ref magic), ReadOptionFlag.None); if (bytesRead != sizeof(uint) || magic != AesXtsFileHeader.AesXtsFileMagic) return 0; - file.Read(out bytesRead, fileSizeOffset, SpanHelpers.AsByteSpan(ref fileSize), ReadOption.None); + file.Read(out bytesRead, fileSizeOffset, SpanHelpers.AsByteSpan(ref fileSize), ReadOptionFlag.None); if (bytesRead != sizeof(long) || magic != AesXtsFileHeader.AesXtsFileMagic) return 0; return fileSize; diff --git a/src/LibHac/FsSystem/AesXtsFile.cs b/src/LibHac/FsSystem/AesXtsFile.cs index 72a0ca35..3982ef51 100644 --- a/src/LibHac/FsSystem/AesXtsFile.cs +++ b/src/LibHac/FsSystem/AesXtsFile.cs @@ -54,7 +54,7 @@ namespace LibHac.FsSystem return key; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -68,7 +68,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out bool isResizeNeeded); if (rc.IsFailure()) return rc; @@ -82,7 +82,7 @@ namespace LibHac.FsSystem rc = BaseStorage.Write(offset, source); if (rc.IsFailure()) return rc; - if ((options & WriteOption.Flush) != 0) + if ((options & WriteOptionFlag.Flush) != 0) { return Flush(); } diff --git a/src/LibHac/FsSystem/AesXtsFileSystem.cs b/src/LibHac/FsSystem/AesXtsFileSystem.cs index 7335f93f..e0d81c68 100644 --- a/src/LibHac/FsSystem/AesXtsFileSystem.cs +++ b/src/LibHac/FsSystem/AesXtsFileSystem.cs @@ -276,7 +276,7 @@ namespace LibHac.FsSystem using (file) { - file.Write(0, header.ToBytes(false), WriteOption.Flush).ThrowIfFailure(); + file.Write(0, header.ToBytes(false), WriteOptionFlag.Flush).ThrowIfFailure(); } } } diff --git a/src/LibHac/FsSystem/ConcatenationFile.cs b/src/LibHac/FsSystem/ConcatenationFile.cs index c2eecf62..a508620c 100644 --- a/src/LibHac/FsSystem/ConcatenationFile.cs +++ b/src/LibHac/FsSystem/ConcatenationFile.cs @@ -34,7 +34,7 @@ namespace LibHac.FsSystem } } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -70,7 +70,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out _); if (rc.IsFailure()) return rc; @@ -99,7 +99,7 @@ namespace LibHac.FsSystem remaining -= bytesToWrite; } - if (options.HasFlag(WriteOption.Flush)) + if (options.HasFlag(WriteOptionFlag.Flush)) { return Flush(); } diff --git a/src/LibHac/FsSystem/DirectorySaveDataFile.cs b/src/LibHac/FsSystem/DirectorySaveDataFile.cs index 1fd44bc7..c578a09d 100644 --- a/src/LibHac/FsSystem/DirectorySaveDataFile.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFile.cs @@ -16,12 +16,12 @@ namespace LibHac.FsSystem Mode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { return BaseFile.Read(out bytesRead, offset, destination, options); } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { return BaseFile.Write(offset, source, options); } diff --git a/src/LibHac/FsSystem/DirectoryUtils.cs b/src/LibHac/FsSystem/DirectoryUtils.cs index feaf3659..5be86fa0 100644 --- a/src/LibHac/FsSystem/DirectoryUtils.cs +++ b/src/LibHac/FsSystem/DirectoryUtils.cs @@ -61,10 +61,10 @@ namespace LibHac.FsSystem while (offset < fileSize) { - rc = srcFile.Read(out long bytesRead, offset, copyBuffer, ReadOption.None); + rc = srcFile.Read(out long bytesRead, offset, copyBuffer, ReadOptionFlag.None); if (rc.IsFailure()) return rc; - rc = dstFile.Write(offset, copyBuffer.Slice(0, (int)bytesRead), WriteOption.None); + rc = dstFile.Write(offset, copyBuffer.Slice(0, (int)bytesRead), WriteOptionFlag.None); if (rc.IsFailure()) return rc; offset += bytesRead; diff --git a/src/LibHac/FsSystem/FileSystemExtensions.cs b/src/LibHac/FsSystem/FileSystemExtensions.cs index 858cf318..f9ad2701 100644 --- a/src/LibHac/FsSystem/FileSystemExtensions.cs +++ b/src/LibHac/FsSystem/FileSystemExtensions.cs @@ -224,12 +224,12 @@ namespace LibHac.FsSystem public static Result Read(this IFile file, out long bytesRead, long offset, Span destination) { - return file.Read(out bytesRead, offset, destination, ReadOption.None); + return file.Read(out bytesRead, offset, destination, ReadOptionFlag.None); } public static Result Write(this IFile file, long offset, ReadOnlySpan source) { - return file.Write(offset, source, WriteOption.None); + return file.Write(offset, source, WriteOptionFlag.None); } public static bool DirectoryExists(this IFileSystem fs, string path) diff --git a/src/LibHac/FsSystem/LocalFile.cs b/src/LibHac/FsSystem/LocalFile.cs index 6e922cc0..cb47bdc9 100644 --- a/src/LibHac/FsSystem/LocalFile.cs +++ b/src/LibHac/FsSystem/LocalFile.cs @@ -27,7 +27,7 @@ namespace LibHac.FsSystem File = new StreamFile(Stream, mode); } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = 0; @@ -37,7 +37,7 @@ namespace LibHac.FsSystem return File.Read(out bytesRead, offset, destination.Slice(0, (int)toRead), options); } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out _); if (rc.IsFailure()) return rc; diff --git a/src/LibHac/FsSystem/NullFile.cs b/src/LibHac/FsSystem/NullFile.cs index 4bfdbcf7..7a91e723 100644 --- a/src/LibHac/FsSystem/NullFile.cs +++ b/src/LibHac/FsSystem/NullFile.cs @@ -16,7 +16,7 @@ namespace LibHac.FsSystem private long Length { get; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = 0; @@ -29,7 +29,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { return Result.Success; } diff --git a/src/LibHac/FsSystem/PartitionFile.cs b/src/LibHac/FsSystem/PartitionFile.cs index 0ada32ed..fd40143f 100644 --- a/src/LibHac/FsSystem/PartitionFile.cs +++ b/src/LibHac/FsSystem/PartitionFile.cs @@ -18,7 +18,7 @@ namespace LibHac.FsSystem Size = size; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = 0; @@ -32,7 +32,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out bool isResizeNeeded); if (rc.IsFailure()) return rc; @@ -45,7 +45,7 @@ namespace LibHac.FsSystem if (rc.IsFailure()) return rc; // N doesn't flush if the flag is set - if (options.HasFlag(WriteOption.Flush)) + if (options.HasFlag(WriteOptionFlag.Flush)) { return BaseStorage.Flush(); } diff --git a/src/LibHac/FsSystem/PartitionFileSystemCore.cs b/src/LibHac/FsSystem/PartitionFileSystemCore.cs index f6bb15bb..ee8fc647 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemCore.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemCore.cs @@ -123,7 +123,7 @@ namespace LibHac.FsSystem Mode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -240,7 +240,7 @@ namespace LibHac.FsSystem return rc; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out bool isResizeNeeded); if (rc.IsFailure()) return rc; diff --git a/src/LibHac/FsSystem/ReadOnlyFile.cs b/src/LibHac/FsSystem/ReadOnlyFile.cs index 211f9d4d..037ae03f 100644 --- a/src/LibHac/FsSystem/ReadOnlyFile.cs +++ b/src/LibHac/FsSystem/ReadOnlyFile.cs @@ -12,7 +12,7 @@ namespace LibHac.FsSystem BaseFile = baseFile; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { return BaseFile.Read(out bytesRead, offset, destination, options); } @@ -27,7 +27,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { return ResultFs.InvalidOpenModeForWrite.Log(); } diff --git a/src/LibHac/FsSystem/RomFs/RomFsFile.cs b/src/LibHac/FsSystem/RomFs/RomFsFile.cs index 11d05b38..e4c6fb08 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsFile.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFile.cs @@ -16,7 +16,7 @@ namespace LibHac.FsSystem.RomFs Size = size; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -33,7 +33,7 @@ namespace LibHac.FsSystem.RomFs return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { return ResultFs.UnsupportedOperationModifyRomFsFile.Log(); } diff --git a/src/LibHac/FsSystem/Save/SaveDataFile.cs b/src/LibHac/FsSystem/Save/SaveDataFile.cs index 1718411f..300d2555 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFile.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFile.cs @@ -22,7 +22,7 @@ namespace LibHac.FsSystem.Save Size = size; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -42,7 +42,7 @@ namespace LibHac.FsSystem.Save return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out bool isResizeNeeded); if (rc.IsFailure()) return rc; @@ -55,7 +55,7 @@ namespace LibHac.FsSystem.Save BaseStorage.Write(offset, source); - if ((options & WriteOption.Flush) != 0) + if ((options & WriteOptionFlag.Flush) != 0) { return Flush(); } diff --git a/src/LibHac/FsSystem/StorageFile.cs b/src/LibHac/FsSystem/StorageFile.cs index 96d23a30..eeeb4511 100644 --- a/src/LibHac/FsSystem/StorageFile.cs +++ b/src/LibHac/FsSystem/StorageFile.cs @@ -14,7 +14,7 @@ namespace LibHac.FsSystem Mode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -34,7 +34,7 @@ namespace LibHac.FsSystem return Result.Success; } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out bool isResizeNeeded); if (rc.IsFailure()) return rc; @@ -48,7 +48,7 @@ namespace LibHac.FsSystem rc = BaseStorage.Write(offset, source); if (rc.IsFailure()) return rc; - if (options.HasFlag(WriteOption.Flush)) + if (options.HasFlag(WriteOptionFlag.Flush)) { return Flush(); } diff --git a/src/LibHac/FsSystem/StreamFile.cs b/src/LibHac/FsSystem/StreamFile.cs index 12378b77..ee915679 100644 --- a/src/LibHac/FsSystem/StreamFile.cs +++ b/src/LibHac/FsSystem/StreamFile.cs @@ -21,7 +21,7 @@ namespace LibHac.FsSystem Mode = mode; } - protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOption options) + protected override Result ReadImpl(out long bytesRead, long offset, Span destination, ReadOptionFlag options) { bytesRead = default; @@ -40,7 +40,7 @@ namespace LibHac.FsSystem } } - protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOption options) + protected override Result WriteImpl(long offset, ReadOnlySpan source, WriteOptionFlag options) { Result rc = ValidateWriteParams(offset, source.Length, Mode, out _); if (rc.IsFailure()) return rc; @@ -51,7 +51,7 @@ namespace LibHac.FsSystem BaseStream.Write(source); } - if (options.HasFlag(WriteOption.Flush)) + if (options.HasFlag(WriteOptionFlag.Flush)) { return Flush(); } diff --git a/src/LibHac/FsSystem/Utility.cs b/src/LibHac/FsSystem/Utility.cs index 8e03cc33..b7eeaadc 100644 --- a/src/LibHac/FsSystem/Utility.cs +++ b/src/LibHac/FsSystem/Utility.cs @@ -209,10 +209,10 @@ namespace LibHac.FsSystem while (remaining > 0) { - rc = sourceFile.Read(out long bytesRead, offset, workBuffer, ReadOption.None); + rc = sourceFile.Read(out long bytesRead, offset, workBuffer, ReadOptionFlag.None); if (rc.IsFailure()) return rc; - rc = destFile.Write(offset, workBuffer.Slice(0, (int)bytesRead), WriteOption.None); + rc = destFile.Write(offset, workBuffer.Slice(0, (int)bytesRead), WriteOptionFlag.None); if (rc.IsFailure()) return rc; remaining -= bytesRead; diff --git a/src/LibHac/Kvdb/KeyValueDatabase.cs b/src/LibHac/Kvdb/KeyValueDatabase.cs index 1ea5680d..62147c07 100644 --- a/src/LibHac/Kvdb/KeyValueDatabase.cs +++ b/src/LibHac/Kvdb/KeyValueDatabase.cs @@ -190,7 +190,7 @@ namespace LibHac.Kvdb rc = FsClient.OpenFile(out FileHandle handle, FileName, OpenMode.Write); if (rc.IsFailure()) return rc; - rc = FsClient.WriteFile(handle, 0, data, WriteOption.Flush); + rc = FsClient.WriteFile(handle, 0, data, WriteOptionFlag.Flush); FsClient.CloseFile(handle); return rc; diff --git a/src/LibHac/Loader/NsoReader.cs b/src/LibHac/Loader/NsoReader.cs index 17c9039f..628fb25e 100644 --- a/src/LibHac/Loader/NsoReader.cs +++ b/src/LibHac/Loader/NsoReader.cs @@ -13,7 +13,7 @@ namespace LibHac.Loader public Result Initialize(IFile nsoFile) { - Result rc = nsoFile.Read(out long bytesRead, 0, SpanHelpers.AsByteSpan(ref Header), ReadOption.None); + Result rc = nsoFile.Read(out long bytesRead, 0, SpanHelpers.AsByteSpan(ref Header), ReadOptionFlag.None); if (rc.IsFailure()) return rc; if (bytesRead != Unsafe.SizeOf()) @@ -69,7 +69,7 @@ namespace LibHac.Loader // Load data from file. uint loadAddress = isCompressed ? (uint)buffer.Length - fileSize : 0; - Result rc = NsoFile.Read(out long bytesRead, segment.FileOffset, buffer.Slice((int)loadAddress), ReadOption.None); + Result rc = NsoFile.Read(out long bytesRead, segment.FileOffset, buffer.Slice((int)loadAddress), ReadOptionFlag.None); if (rc.IsFailure()) return rc; if (bytesRead != fileSize) diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs index 3cda8312..39893cf7 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/CommittableIFileSystemTests.Commit.cs @@ -26,8 +26,8 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file1, "/dir1/file".ToU8Span(), OpenMode.Write).ThrowIfFailure(); fs.OpenFile(out IFile file2, "/dir2/file".ToU8Span(), OpenMode.Write).ThrowIfFailure(); - file1.Write(0, data1, WriteOption.Flush).ThrowIfFailure(); - file2.Write(0, data2, WriteOption.Flush).ThrowIfFailure(); + file1.Write(0, data1, WriteOptionFlag.Flush).ThrowIfFailure(); + file2.Write(0, data2, WriteOptionFlag.Flush).ThrowIfFailure(); file1.Dispose(); file2.Dispose(); @@ -45,7 +45,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase using (file1) { - Assert.Success(file1.Read(out long bytesRead, 0, readData1, ReadOption.None)); + Assert.Success(file1.Read(out long bytesRead, 0, readData1, ReadOptionFlag.None)); Assert.Equal(data1.Length, bytesRead); } @@ -55,7 +55,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase using (file2) { - Assert.Success(file2.Read(out long bytesRead, 0, readData2, ReadOption.None)); + Assert.Success(file2.Read(out long bytesRead, 0, readData2, ReadOptionFlag.None)); Assert.Equal(data2.Length, bytesRead); } @@ -110,7 +110,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.CreateFile("/dir/file".ToU8Span(), data1.Length, CreateFileOptions.None).ThrowIfFailure(); fs.OpenFile(out IFile file, "/dir/file".ToU8Span(), OpenMode.Write).ThrowIfFailure(); - file.Write(0, data1, WriteOption.Flush).ThrowIfFailure(); + file.Write(0, data1, WriteOptionFlag.Flush).ThrowIfFailure(); file.Dispose(); // Commit and reopen the file system @@ -121,7 +121,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase // Make changes to the file fs.OpenFile(out file, "/dir/file".ToU8Span(), OpenMode.Write).ThrowIfFailure(); - file.Write(0, data2, WriteOption.Flush).ThrowIfFailure(); + file.Write(0, data2, WriteOptionFlag.Flush).ThrowIfFailure(); file.Dispose(); Assert.Success(fs.Rollback()); @@ -133,7 +133,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase using (file) { - Assert.Success(file.Read(out long bytesRead, 0, readData, ReadOption.None)); + Assert.Success(file.Read(out long bytesRead, 0, readData, ReadOptionFlag.None)); Assert.Equal(data1.Length, bytesRead); } diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs index 8233e9ba..6e06280f 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Read.cs @@ -18,7 +18,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Assert.True(file.Read(out long bytesRead, 50, buffer, ReadOption.None).IsSuccess()); + Assert.True(file.Read(out long bytesRead, 50, buffer, ReadOptionFlag.None).IsSuccess()); Assert.Equal(20, bytesRead); } } @@ -34,7 +34,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Result rc = file.Read(out _, 1, buffer, ReadOption.None); + Result rc = file.Read(out _, 1, buffer, ReadOptionFlag.None); Assert.Equal(ResultFs.OutOfRange.Value, rc); } } @@ -50,7 +50,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); using (file) { - Result rc = file.Read(out _, 0, buffer, ReadOption.None); + Result rc = file.Read(out _, 0, buffer, ReadOptionFlag.None); Assert.Equal(ResultFs.InvalidOpenModeForRead.Value, rc); } } @@ -66,7 +66,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); using (file) { - Result rc = file.Read(out _, -5, buffer, ReadOption.None); + Result rc = file.Read(out _, -5, buffer, ReadOptionFlag.None); Assert.Equal(ResultFs.OutOfRange.Value, rc); } } @@ -82,7 +82,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); using (file) { - Result rc = file.Read(out _, long.MaxValue - 5, buffer, ReadOption.None); + Result rc = file.Read(out _, long.MaxValue - 5, buffer, ReadOptionFlag.None); Assert.Equal(ResultFs.OutOfRange.Value, rc); } } @@ -98,7 +98,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Assert.True(file.Read(out long bytesRead, 90, buffer, ReadOption.None).IsSuccess()); + Assert.True(file.Read(out long bytesRead, 90, buffer, ReadOptionFlag.None).IsSuccess()); Assert.Equal(10, bytesRead); } } @@ -114,7 +114,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); using (file) { - file.Write(0, new byte[100], WriteOption.None); + file.Write(0, new byte[100], WriteOptionFlag.None); } var bufferExpected = new byte[200]; @@ -126,7 +126,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Assert.True(file.Read(out _, 90, buffer, ReadOption.None).IsSuccess()); + Assert.True(file.Read(out _, 90, buffer, ReadOptionFlag.None).IsSuccess()); Assert.Equal(bufferExpected, buffer); } } diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs index 0c259473..a004acc2 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.IFile.Write.cs @@ -17,7 +17,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.CreateFile("/file".ToU8Span(), data.Length, CreateFileOptions.None); fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); - file.Write(0, data, WriteOption.None); + file.Write(0, data, WriteOptionFlag.None); file.Dispose(); var readData = new byte[data.Length]; @@ -25,7 +25,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Assert.True(file.Read(out long bytesRead, 0, readData, ReadOption.None).IsSuccess()); + Assert.True(file.Read(out long bytesRead, 0, readData, ReadOptionFlag.None).IsSuccess()); Assert.Equal(data.Length, bytesRead); } @@ -43,7 +43,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); using (file) { - Result rc = file.Write(5, buffer, WriteOption.None); + Result rc = file.Write(5, buffer, WriteOptionFlag.None); Assert.Equal(ResultFs.FileExtensionWithoutOpenModeAllowAppend.Value, rc); } } @@ -59,7 +59,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Result rc = file.Write(5, buffer, WriteOption.None); + Result rc = file.Write(5, buffer, WriteOptionFlag.None); Assert.Equal(ResultFs.InvalidOpenModeForWrite.Value, rc); } } @@ -75,7 +75,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Result rc = file.Write(-5, buffer, WriteOption.None); + Result rc = file.Write(-5, buffer, WriteOptionFlag.None); Assert.Equal(ResultFs.OutOfRange.Value, rc); } } @@ -91,7 +91,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Read); using (file) { - Result rc = file.Write(long.MaxValue - 5, buffer, WriteOption.None); + Result rc = file.Write(long.MaxValue - 5, buffer, WriteOptionFlag.None); Assert.Equal(ResultFs.OutOfRange.Value, rc); } } @@ -107,7 +107,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.All); using (file) { - Assert.True(file.Write(5, buffer, WriteOption.None).IsSuccess()); + Assert.True(file.Write(5, buffer, WriteOptionFlag.None).IsSuccess()); file.GetSize(out long newSize); Assert.Equal(15, newSize); @@ -125,7 +125,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.All); using (file) { - Assert.True(file.Write(15, buffer, WriteOption.None).IsSuccess()); + Assert.True(file.Write(15, buffer, WriteOptionFlag.None).IsSuccess()); file.GetSize(out long newSize); Assert.Equal(25, newSize); @@ -148,10 +148,10 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.All); using (file) { - Assert.True(file.Write(15, writeBuffer, WriteOption.None).IsSuccess()); + Assert.True(file.Write(15, writeBuffer, WriteOptionFlag.None).IsSuccess()); // Unwritten portions of new files are undefined, so write to the other portions - file.Write(0, new byte[15], WriteOption.None); + file.Write(0, new byte[15], WriteOptionFlag.None); } var readBuffer = new byte[25]; @@ -159,7 +159,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.OpenFile(out file, "/file".ToU8Span(), OpenMode.Read); using (file) { - file.Read(out _, 0, readBuffer, ReadOption.None); + file.Read(out _, 0, readBuffer, ReadOptionFlag.None); Assert.Equal(bufferExpected, readBuffer); } } diff --git a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs index f588af0d..07cdce09 100644 --- a/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs +++ b/tests/LibHac.Tests/Fs/IFileSystemTestBase/IFileSystemTests.RenameFile.cs @@ -98,7 +98,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase fs.CreateFile("/file".ToU8Span(), data.Length, CreateFileOptions.None); fs.OpenFile(out IFile file, "/file".ToU8Span(), OpenMode.Write); - file.Write(0, data, WriteOption.None); + file.Write(0, data, WriteOptionFlag.None); file.Dispose(); fs.RenameFile("/file".ToU8Span(), "/renamed".ToU8Span()); @@ -106,7 +106,7 @@ namespace LibHac.Tests.Fs.IFileSystemTestBase var readData = new byte[data.Length]; fs.OpenFile(out file, "/renamed".ToU8Span(), OpenMode.Read); - Result rc = file.Read(out long bytesRead, 0, readData, ReadOption.None); + Result rc = file.Read(out long bytesRead, 0, readData, ReadOptionFlag.None); file.Dispose(); Assert.True(rc.IsSuccess());