PR feedback from #3353 - format IsValidPacket

edwardneal · edwardneal · commit 0767cd77650b · 2025-05-21T05:34:43.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
@@ -335,11 +335,9 @@ internal override PacketHandle AddPacketToPendingList(PacketHandle packetToAdd)
         internal override bool IsValidPacket(PacketHandle packetPointer)
         {
             Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType || packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");
-            return (
-                (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
-                ||
-                (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)
-            );
+
+            return (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
+                || (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null);
         }
 
         internal override PacketHandle GetResetWritePacket(int dataSize)
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
@@ -125,11 +125,9 @@ internal override PacketHandle AddPacketToPendingList(PacketHandle packetToAdd)
         internal override bool IsValidPacket(PacketHandle packetPointer)
         {
             Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType || packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");
-            return (
-                (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
-                ||
-                (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)
-            );
+
+            return (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)
+                || (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null);
         }
 
         internal override PacketHandle GetResetWritePacket(int dataSize)

Original file line number	Diff line number	Diff line change
`@@ -335,11 +335,9 @@ internal override PacketHandle AddPacketToPendingList(PacketHandle packetToAdd)`
`335`	`335`	`internal override bool IsValidPacket(PacketHandle packetPointer)`
`336`	`336`	`{`
`337`	`337`	`Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType \|\| packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");`
`338`		`- return (`
`339`		`- (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)`
`340`		`- \|\|`
`341`		`- (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)`
`342`		`- );`
	`338`	`+`
	`339`	`+ return (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)`
	`340`	`+ \|\| (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null);`
`343`	`341`	`}`
`344`	`342`
`345`	`343`	`internal override PacketHandle GetResetWritePacket(int dataSize)`
Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,9 @@ internal override PacketHandle AddPacketToPendingList(PacketHandle packetToAdd)`
`125`	`125`	`internal override bool IsValidPacket(PacketHandle packetPointer)`
`126`	`126`	`{`
`127`	`127`	`Debug.Assert(packetPointer.Type == PacketHandle.NativePointerType \|\| packetPointer.Type == PacketHandle.NativePacketType, "unexpected packet type when requiring NativePointer");`
`128`		`- return (`
`129`		`- (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)`
`130`		`- \|\|`
`131`		`- (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null)`
`132`		`- );`
	`128`	`+`
	`129`	`+ return (packetPointer.Type == PacketHandle.NativePointerType && packetPointer.NativePointer != IntPtr.Zero)`
	`130`	`+ \|\| (packetPointer.Type == PacketHandle.NativePacketType && packetPointer.NativePacket != null);`
`133`	`131`	`}`
`134`	`132`
`135`	`133`	`internal override PacketHandle GetResetWritePacket(int dataSize)`