From 8a8ea4c8c00e8ba23349d9cdb0a6b681d09e6b0d Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Thu, 17 Oct 2019 01:17:44 -0500
Subject: Update to LibHac 0.6.0 (#792)

* Update to LibHac 0.6.0

* Create an IFileSystemProxy object from LibHac

* Rename rc -> result

* Alignment and spacing

* Result formatting

* Spacing

* Sort usings
---
 .../HOS/Services/Fs/FileSystemProxy/IFile.cs       | 62 ++++------------------
 1 file changed, 11 insertions(+), 51 deletions(-)

(limited to 'Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs')

diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
index df9209e6..f09624f8 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
@@ -26,22 +26,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
             long size   = context.RequestData.ReadInt64();
 
             byte[] data = new byte[size];
-            int readSize;
 
-            try
-            {
-                readSize = _baseFile.Read(data, offset, readOption);
-            }
-            catch (HorizonResultException ex)
-            {
-                return (ResultCode)ex.ResultValue.Value;
-            }
+            Result result = _baseFile.Read(out long bytesRead, offset, data, readOption);
 
             context.Memory.WriteBytes(position, data);
 
-            context.ResponseData.Write((long)readSize);
+            context.ResponseData.Write(bytesRead);
 
-            return ResultCode.Success;
+            return (ResultCode)result.Value;
         }
 
         [Command(1)]
@@ -58,66 +50,34 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
 
             byte[] data = context.Memory.ReadBytes(position, size);
 
-            try
-            {
-                _baseFile.Write(data, offset, writeOption);
-            }
-            catch (HorizonResultException ex)
-            {
-                return (ResultCode)ex.ResultValue.Value;
-            }
-
-            return ResultCode.Success;
+            return (ResultCode)_baseFile.Write(offset, data, writeOption).Value;
         }
 
         [Command(2)]
         // Flush()
         public ResultCode Flush(ServiceCtx context)
         {
-            try
-            {
-                _baseFile.Flush();
-            }
-            catch (HorizonResultException ex)
-            {
-                return (ResultCode)ex.ResultValue.Value;
-            }
-
-            return ResultCode.Success;
+            return (ResultCode)_baseFile.Flush().Value;
         }
 
         [Command(3)]
         // SetSize(u64 size)
         public ResultCode SetSize(ServiceCtx context)
         {
-            try
-            {
-                long size = context.RequestData.ReadInt64();
-
-                _baseFile.SetSize(size);
-            }
-            catch (HorizonResultException ex)
-            {
-                return (ResultCode)ex.ResultValue.Value;
-            }
+            long size = context.RequestData.ReadInt64();
 
-            return ResultCode.Success;
+            return (ResultCode)_baseFile.SetSize(size).Value;
         }
 
         [Command(4)]
         // GetSize() -> u64 fileSize
         public ResultCode GetSize(ServiceCtx context)
         {
-            try
-            {
-                context.ResponseData.Write(_baseFile.GetSize());
-            }
-            catch (HorizonResultException ex)
-            {
-                return (ResultCode)ex.ResultValue.Value;
-            }
+            Result result = _baseFile.GetSize(out long size);
+
+            context.ResponseData.Write(size);
 
-            return ResultCode.Success;
+            return (ResultCode)result.Value;
         }
 
         public void Dispose()
-- 
cgit v1.2.3