Skip to content

Commit fc21071

Browse files
committed
Use switch expressions to reduce nested ternaries.
1 parent abb43d4 commit fc21071

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/MySqlConnector/Protocol/Serialization/SocketByteHandler.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ private ValueTask<int> DoReadBytesSync(Memory<byte> buffer)
7070
private async ValueTask<int> DoReadBytesAsync(Memory<byte> buffer)
7171
{
7272
var startTime = RemainingTimeout == Constants.InfiniteTimeout ? 0 : Environment.TickCount;
73-
var timerId = RemainingTimeout == Constants.InfiniteTimeout ? 0 :
74-
RemainingTimeout <= 0 ? throw MySqlException.CreateForTimeout() :
75-
TimerQueue.Instance.Add(RemainingTimeout, m_closeSocket);
73+
var timerId = RemainingTimeout switch
74+
{
75+
Constants.InfiniteTimeout => 0u,
76+
<= 0 => throw MySqlException.CreateForTimeout(),
77+
_ => TimerQueue.Instance.Add(RemainingTimeout, m_closeSocket),
78+
};
7679
#if NET45 || NET461 || NET471 || NETSTANDARD1_3 || NETSTANDARD2_0
7780
m_socketAwaitable.EventArgs.SetBuffer(buffer);
7881
#endif

src/MySqlConnector/Utilities/Utility.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,13 @@ public static void SwapBytes(byte[] bytes, int offset1, int offset2)
489489

490490
public static void GetOSDetails(out string? os, out string osDescription, out string architecture)
491491
{
492-
os = Environment.OSVersion.Platform == PlatformID.Win32NT ? "Windows" :
493-
Environment.OSVersion.Platform == PlatformID.Unix ? "Linux" :
494-
Environment.OSVersion.Platform == PlatformID.MacOSX ? "macOS" : null;
492+
os = Environment.OSVersion.Platform switch
493+
{
494+
PlatformID.Win32NT => "Windows",
495+
PlatformID.Unix => "Linux",
496+
PlatformID.MacOSX => "macOS",
497+
_ => null,
498+
};
495499
osDescription = Environment.OSVersion.VersionString;
496500
architecture = IntPtr.Size == 8 ? "X64" : "X86";
497501
}

0 commit comments

Comments
 (0)