Skip to content

Commit 2efca1e

Browse files
committed
removed unused buffers parameter
1 parent ac76468 commit 2efca1e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketAsyncContext.Unix.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,15 +1722,15 @@ public SocketError ReceiveFromAsync(IList<ArraySegment<byte>> buffers, SocketFla
17221722
}
17231723

17241724
public SocketError ReceiveMessageFrom(
1725-
Memory<byte> buffer, IList<ArraySegment<byte>>? buffers, ref SocketFlags flags, byte[] socketAddress, ref int socketAddressLen, bool isIPv4, bool isIPv6, int timeout, out IPPacketInformation ipPacketInformation, out int bytesReceived)
1725+
Memory<byte> buffer, ref SocketFlags flags, byte[] socketAddress, ref int socketAddressLen, bool isIPv4, bool isIPv6, int timeout, out IPPacketInformation ipPacketInformation, out int bytesReceived)
17261726
{
17271727
Debug.Assert(timeout == -1 || timeout > 0, $"Unexpected timeout: {timeout}");
17281728

17291729
SocketFlags receivedFlags;
17301730
SocketError errorCode;
17311731
int observedSequenceNumber;
17321732
if (_receiveQueue.IsReady(this, out observedSequenceNumber) &&
1733-
(SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer.Span, buffers, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode) ||
1733+
(SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer.Span, null, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode) ||
17341734
!ShouldRetrySyncOperation(out errorCode)))
17351735
{
17361736
flags = receivedFlags;
@@ -1740,7 +1740,7 @@ public SocketError ReceiveMessageFrom(
17401740
var operation = new ReceiveMessageFromOperation(this)
17411741
{
17421742
Buffer = buffer,
1743-
Buffers = buffers,
1743+
Buffers = null,
17441744
Flags = flags,
17451745
SocketAddress = socketAddress,
17461746
SocketAddressLen = socketAddressLen,
@@ -1758,15 +1758,15 @@ public SocketError ReceiveMessageFrom(
17581758
}
17591759

17601760
public unsafe SocketError ReceiveMessageFrom(
1761-
Span<byte> buffer, IList<ArraySegment<byte>>? buffers, ref SocketFlags flags, byte[] socketAddress, ref int socketAddressLen, bool isIPv4, bool isIPv6, int timeout, out IPPacketInformation ipPacketInformation, out int bytesReceived)
1761+
Span<byte> buffer, ref SocketFlags flags, byte[] socketAddress, ref int socketAddressLen, bool isIPv4, bool isIPv6, int timeout, out IPPacketInformation ipPacketInformation, out int bytesReceived)
17621762
{
17631763
Debug.Assert(timeout == -1 || timeout > 0, $"Unexpected timeout: {timeout}");
17641764

17651765
SocketFlags receivedFlags;
17661766
SocketError errorCode;
17671767
int observedSequenceNumber;
17681768
if (_receiveQueue.IsReady(this, out observedSequenceNumber) &&
1769-
(SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer, buffers, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode) ||
1769+
(SocketPal.TryCompleteReceiveMessageFrom(_socket, buffer, null, flags, socketAddress, ref socketAddressLen, isIPv4, isIPv6, out bytesReceived, out receivedFlags, out ipPacketInformation, out errorCode) ||
17701770
!ShouldRetrySyncOperation(out errorCode)))
17711771
{
17721772
flags = receivedFlags;
@@ -1779,7 +1779,7 @@ public unsafe SocketError ReceiveMessageFrom(
17791779
{
17801780
BufferPtr = bufferPtr,
17811781
Length = buffer.Length,
1782-
Buffers = buffers,
1782+
Buffers = null,
17831783
Flags = flags,
17841784
SocketAddress = socketAddress,
17851785
SocketAddressLen = socketAddressLen,

src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ public static SocketError ReceiveMessageFrom(Socket socket, SafeSocketHandle han
11721172
SocketError errorCode;
11731173
if (!handle.IsNonBlocking)
11741174
{
1175-
errorCode = handle.AsyncContext.ReceiveMessageFrom(new Memory<byte>(buffer, offset, count), null, ref socketFlags, socketAddressBuffer, ref socketAddressLen, isIPv4, isIPv6, handle.ReceiveTimeout, out ipPacketInformation, out bytesTransferred);
1175+
errorCode = handle.AsyncContext.ReceiveMessageFrom(new Memory<byte>(buffer, offset, count), ref socketFlags, socketAddressBuffer, ref socketAddressLen, isIPv4, isIPv6, handle.ReceiveTimeout, out ipPacketInformation, out bytesTransferred);
11761176
}
11771177
else
11781178
{
@@ -1199,7 +1199,7 @@ public static SocketError ReceiveMessageFrom(Socket socket, SafeSocketHandle han
11991199
SocketError errorCode;
12001200
if (!handle.IsNonBlocking)
12011201
{
1202-
errorCode = handle.AsyncContext.ReceiveMessageFrom(buffer, null, ref socketFlags, socketAddressBuffer, ref socketAddressLen, isIPv4, isIPv6, handle.ReceiveTimeout, out ipPacketInformation, out bytesTransferred);
1202+
errorCode = handle.AsyncContext.ReceiveMessageFrom(buffer, ref socketFlags, socketAddressBuffer, ref socketAddressLen, isIPv4, isIPv6, handle.ReceiveTimeout, out ipPacketInformation, out bytesTransferred);
12031203
}
12041204
else
12051205
{

0 commit comments

Comments
 (0)