qol, Improve equals

juliusfriedman · Nov 15, 2023 · 74ebe3e · 74ebe3e
1 parent cdb9509
commit 74ebe3e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/Rtp/Rtcp/RtcpHeader.cs b/Rtp/Rtcp/RtcpHeader.cs
@@ -602,9 +602,7 @@ public override bool Equals(object obj)
         {
             if(System.Object.ReferenceEquals(this, obj)) return true;
 
-            if (false.Equals((obj is RtcpHeader))) return false;
-
-            return Equals(obj as RtcpHeader);
+            return obj is RtcpHeader header && Equals(header);
         }
 
         #endregion

diff --git a/Rtp/Rtcp/RtcpPacket.cs b/Rtp/Rtcp/RtcpPacket.cs
@@ -1011,9 +1011,7 @@ public override bool Equals(object obj)
         {
             if (System.Object.ReferenceEquals(this, obj)) return true;
 
-            if ((obj is RtcpPacket) is false) return false;
-
-            return Equals(obj as RtcpPacket);
+            return obj is RtcpPacket rtcp && Equals(rtcp);
         }
 
         //Packet equals...

diff --git a/Rtp/RtpHeader.cs b/Rtp/RtpHeader.cs
@@ -602,9 +602,7 @@ public override bool Equals(object obj)
         {
             if (System.Object.ReferenceEquals(this, obj)) return true;
 
-            if (false.Equals((obj is RtpHeader))) return false;
-
-            return Equals(obj as RtpHeader);
+            return obj is RtpHeader header && Equals(header);
         }
 
         #endregion

diff --git a/Rtp/RtpPacket.cs b/Rtp/RtpPacket.cs
@@ -909,9 +909,7 @@ public override bool Equals(object obj)
         {
             if (System.Object.ReferenceEquals(this, obj)) return true;
 
-            if (false.Equals((obj is RtpPacket))) return false;
-
-            return Equals(obj as RtpPacket);
+            return obj is RtpPacket rtp && Equals(rtp);
         }
 
         //Packet equals...

diff --git a/Rtsp/RtspMessage.cs b/Rtsp/RtspMessage.cs
@@ -934,9 +934,7 @@ public override bool Equals(object obj)
         {
             if (System.Object.ReferenceEquals(this, obj)) return true;
 
-            if (false.Equals((obj is RtspMessage))) return false;
-
-            RtspMessage other = obj as RtspMessage;
+            if (obj is not RtspMessage other) return false;
 
             //Fast path doesn't show true equality.
             //other.Created != Created

diff --git a/Sdp/SessionDescription.cs b/Sdp/SessionDescription.cs
@@ -1192,9 +1192,7 @@ public override bool Equals(object obj)
             //System.Object
             if (object.ReferenceEquals(this, obj)) return true;
 
-            if ((obj is SessionDescription) is false) return false;
-
-            return Equals(obj as SessionDescription);
+            return obj is SessionDescription sdp && Equals(sdp);
         }
 
         /// <summary>