diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-06-28 18:41:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 18:41:38 +0200 |
| commit | fc20d9b925b83532a19467293a7cdcbaa4ef3d6b (patch) | |
| tree | ebe0e690b6644d0f825ee80f20e4067855f35cf4 /src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs | |
| parent | 0a75b73fa43ddadf561ddeb0f923c6f3811c025b (diff) | |
[Ryujinx.Common] Address dotnet-format issues (#5358)1.1.936
* 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 IDE0059 warnings
* Address or silence dotnet format IDE1006 warnings
* Address dotnet format CA1816 warnings
* Address or silence dotnet format CA2211 warnings
* Silence CA1806 and CA1834 issues
* Fix formatting for switch expressions
* 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
* Format if-blocks correctly
* Run dotnet format whitespace after rebase
* Run dotnet format style after rebase
* Run dotnet format analyzers after rebase
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Add comments to disabled warnings
* Remove a few unused parameters
* Replace MmeShadowScratch with Array256<uint>
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Run dotnet format after rebase
* Address IDE0251 warnings
* 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
* Second dotnet format pass
* Fix build issues
* Fix StructArrayHelpers.cs
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Fix return statements
* Fix naming rule violations
* Update src/Ryujinx.Common/Utilities/StreamUtils.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Add trailing commas
* Address review feedback
* Address review feedback
* Rename remaining type parameters to TKey and TValue
* Fix manual formatting for logging levels
* Fix spacing before comments
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs')
| -rw-r--r-- | src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs b/src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs index 168960f7..98a0d8ab 100644 --- a/src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs +++ b/src/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs @@ -14,14 +14,14 @@ namespace Ryujinx.Common.SystemInfo { string cpuName = GetCpuidCpuName(); - if (cpuName == null && sysctlbyname("machdep.cpu.brand_string", out cpuName) != 0) + if (cpuName == null && SysctlByName("machdep.cpu.brand_string", out cpuName) != 0) { cpuName = "Unknown"; } ulong totalRAM = 0; - if (sysctlbyname("hw.memsize", ref totalRAM) != 0) // Bytes + if (SysctlByName("hw.memsize", ref totalRAM) != 0) // Bytes { totalRAM = 0; } @@ -63,7 +63,7 @@ namespace Ryujinx.Common.SystemInfo [LibraryImport(SystemLibraryName, SetLastError = true)] private static partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, IntPtr oldValue, ref ulong oldSize, IntPtr newValue, ulong newValueSize); - private static int sysctlbyname(string name, IntPtr oldValue, ref ulong oldSize) + private static int SysctlByName(string name, IntPtr oldValue, ref ulong oldSize) { if (sysctlbyname(name, oldValue, ref oldSize, IntPtr.Zero, 0) == -1) { @@ -77,23 +77,23 @@ namespace Ryujinx.Common.SystemInfo return 0; } - private static int sysctlbyname<T>(string name, ref T oldValue) + private static int SysctlByName<T>(string name, ref T oldValue) { unsafe { ulong oldValueSize = (ulong)Unsafe.SizeOf<T>(); - return sysctlbyname(name, (IntPtr)Unsafe.AsPointer(ref oldValue), ref oldValueSize); + return SysctlByName(name, (IntPtr)Unsafe.AsPointer(ref oldValue), ref oldValueSize); } } - private static int sysctlbyname(string name, out string oldValue) + private static int SysctlByName(string name, out string oldValue) { oldValue = default; ulong strSize = 0; - int res = sysctlbyname(name, IntPtr.Zero, ref strSize); + int res = SysctlByName(name, IntPtr.Zero, ref strSize); if (res == 0) { @@ -103,7 +103,7 @@ namespace Ryujinx.Common.SystemInfo { fixed (byte* rawDataPtr = rawData) { - res = sysctlbyname(name, (IntPtr)rawDataPtr, ref strSize); + res = SysctlByName(name, (IntPtr)rawDataPtr, ref strSize); } if (res == 0) @@ -152,6 +152,6 @@ namespace Ryujinx.Common.SystemInfo } [LibraryImport(SystemLibraryName, SetLastError = true)] - private static partial int host_statistics64(uint host_priv, int host_flavor, ref VMStatistics64 host_info64_out, ref uint host_info64_outCnt); + private static partial int host_statistics64(uint hostPriv, int hostFlavor, ref VMStatistics64 hostInfo64Out, ref uint hostInfo64OutCnt); } } |