From 02b5c7ea89bb6aae1c214b78fb1047872382dc43 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Sat, 1 Jul 2023 12:42:10 +0200
Subject: [Ryujinx.Horizon] Address dotnet-format issues (#5381)

* dotnet format style --severity info

Some changes were manually reverted.

* dotnet format analyzers --serverity info

Some changes have been minimally adapted.

* Restore a few unused methods and variables

* Silence dotnet format IDE0060 warnings

* Silence dotnet format IDE0052 warnings

* Address dotnet format CA1822 warnings

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Revert formatting changes for while and for-loops

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Add comments to disabled warnings

* Remove a few unused parameters

* Simplify properties and array initialization, Use const when possible, Remove trailing commas

* Address IDE0251 warnings

* Silence IDE0060 in .editorconfig

* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"

This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.

* dotnet format whitespace after rebase

* First dotnet format pass

* Add trailing commas and fix formatting issues

* Convert if-else chain to switch block

* Address review feedback
---
 src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs    | 10 +++++-----
 src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/Ryujinx.Horizon/Sm/Impl')

diff --git a/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs b/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
index 50c18a2c..fed420aa 100644
--- a/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
+++ b/src/Ryujinx.Horizon/Sm/Impl/ServiceInfo.cs
@@ -5,16 +5,16 @@ namespace Ryujinx.Horizon.Sm.Impl
     struct ServiceInfo
     {
         public ServiceName Name;
-        public ulong       OwnerProcessId;
-        public int         PortHandle;
+        public ulong OwnerProcessId;
+        public int PortHandle;
 
         public void Free()
         {
             HorizonStatic.Syscall.CloseHandle(PortHandle);
 
-            Name           = ServiceName.Invalid;
+            Name = ServiceName.Invalid;
             OwnerProcessId = 0L;
-            PortHandle     = 0;
+            PortHandle = 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs b/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
index d1f94267..929474aa 100644
--- a/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
+++ b/src/Ryujinx.Horizon/Sm/Impl/ServiceManager.cs
@@ -40,7 +40,7 @@ namespace Ryujinx.Horizon.Sm.Impl
             return result == KernelResult.SessionCountExceeded ? SmResult.OutOfSessions : result;
         }
 
-        private Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
+        private static Result GetServiceImpl(out int handle, ref ServiceInfo serviceInfo)
         {
             return HorizonStatic.Syscall.ConnectToPort(out handle, serviceInfo.PortHandle);
         }
@@ -96,8 +96,8 @@ namespace Ryujinx.Horizon.Sm.Impl
                 return result;
             }
 
-            freeService.PortHandle     = clientPort;
-            freeService.Name           = name;
+            freeService.PortHandle = clientPort;
+            freeService.Name = name;
             freeService.OwnerProcessId = processId;
 
             return Result.Success;
@@ -140,7 +140,7 @@ namespace Ryujinx.Horizon.Sm.Impl
 
             int nameLength = 1;
 
-            for (; nameLength < name.Length; nameLength++)
+            for (; nameLength < ServiceName.Length; nameLength++)
             {
                 if (name[nameLength] == 0)
                 {
@@ -148,7 +148,7 @@ namespace Ryujinx.Horizon.Sm.Impl
                 }
             }
 
-            while (nameLength < name.Length)
+            while (nameLength < ServiceName.Length)
             {
                 if (name[nameLength++] != 0)
                 {
@@ -182,4 +182,4 @@ namespace Ryujinx.Horizon.Sm.Impl
             return -1;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3