From 257103befc661019e46cb6ffeabd54977c3f8224 Mon Sep 17 00:00:00 2001
From: Dennis Korpel <dkorpel@gmail.com>
Date: Tue, 5 Jul 2022 10:53:57 +0200
Subject: [PATCH] Add `scope` to Socket derived functions
---
cgi.d | 20 ++++++++++----------
fibersocket.d | 14 +++++++-------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/cgi.d b/cgi.d
index 89b33d7..9e84553 100644
--- a/cgi.d
+++ b/cgi.d
@@ -4303,7 +4303,7 @@ extern(Windows) private {
alias LPWSAOVERLAPPED = LPOVERLAPPED;
/+
- alias LPFN_ACCEPTEX =
+ alias LPFN_ACCEPTEX =
BOOL
function(
SOCKET sListenSocket,
@@ -4446,7 +4446,7 @@ private class PseudoblockingOverlappedSocket : Socket {
WSABUF[1] buffer;
OVERLAPPED overlapped;
- override ptrdiff_t send(const(void)[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t send(scope const(void)[] buf, SocketFlags flags) @trusted {
overlapped = overlapped.init;
buffer[0].len = cast(DWORD) buf.length;
buffer[0].buf = cast(CHAR*) buf.ptr;
@@ -4461,7 +4461,7 @@ private class PseudoblockingOverlappedSocket : Socket {
Fiber.yield();
return lastAnswer;
}
- override ptrdiff_t receive(void[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t receive(scope void[] buf, SocketFlags flags) @trusted {
overlapped = overlapped.init;
buffer[0].len = cast(DWORD) buf.length;
buffer[0].buf = cast(CHAR*) buf.ptr;
@@ -4482,16 +4482,16 @@ private class PseudoblockingOverlappedSocket : Socket {
}
// I might go back and implement these for udp things.
- override ptrdiff_t receiveFrom(void[] buf, SocketFlags flags, ref Address from) @trusted {
+ override ptrdiff_t receiveFrom(scope void[] buf, SocketFlags flags, ref Address from) @trusted {
assert(0);
}
- override ptrdiff_t receiveFrom(void[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t receiveFrom(scope void[] buf, SocketFlags flags) @trusted {
assert(0);
}
- override ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags, Address to) @trusted {
+ override ptrdiff_t sendTo(scope const(void)[] buf, SocketFlags flags, Address to) @trusted {
assert(0);
}
- override ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t sendTo(scope const(void)[] buf, SocketFlags flags) @trusted {
assert(0);
}
@@ -5117,13 +5117,13 @@ private class FakeSocketForStdin : Socket {
private bool closed;
- override ptrdiff_t receive(void[] buffer, std.socket.SocketFlags) @trusted {
+ override ptrdiff_t receive(scope void[] buffer, std.socket.SocketFlags) @trusted {
if(closed)
throw new Exception("Closed");
return stdin.rawRead(buffer).length;
}
- override ptrdiff_t send(const void[] buffer, std.socket.SocketFlags) @trusted {
+ override ptrdiff_t send(const scope void[] buffer, std.socket.SocketFlags) @trusted {
if(closed)
throw new Exception("Closed");
stdout.rawWrite(buffer);
@@ -5138,7 +5138,7 @@ private class FakeSocketForStdin : Socket {
// FIXME
}
- override void setOption(SocketOptionLevel, SocketOption, void[]) {}
+ override void setOption(SocketOptionLevel, SocketOption, scope void[]) {}
override void setOption(SocketOptionLevel, SocketOption, Duration) {}
override @property @trusted Address remoteAddress() { return null; }
diff --git a/fibersocket.d b/fibersocket.d
index c110706..6bde400 100644
--- a/fibersocket.d
+++ b/fibersocket.d
@@ -185,30 +185,30 @@ class FiberSocket : Socket {
}
return r;
}
-
+
/// Yielding override of the Phobos interface
- override ptrdiff_t send(const(void)[] buf, SocketFlags flags) {
+ override ptrdiff_t send(scope const(void)[] buf, SocketFlags flags) {
return magic( () { return super.send(buf, flags); }, PendingOperation.write);
}
/// ditto
- override ptrdiff_t receive(void[] buf, SocketFlags flags) {
+ override ptrdiff_t receive(scope void[] buf, SocketFlags flags) {
return magic( () { return super.receive(buf, flags); }, PendingOperation.read);
}
/// ditto
- override ptrdiff_t receiveFrom(void[] buf, SocketFlags flags, ref Address from) @trusted {
+ override ptrdiff_t receiveFrom(scope void[] buf, SocketFlags flags, ref Address from) @trusted {
return magic( () { return super.receiveFrom(buf, flags, from); }, PendingOperation.read);
}
/// ditto
- override ptrdiff_t receiveFrom(void[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t receiveFrom(scope void[] buf, SocketFlags flags) @trusted {
return magic( () { return super.receiveFrom(buf, flags); }, PendingOperation.read);
}
/// ditto
- override ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags, Address to) @trusted {
+ override ptrdiff_t sendTo(scope const(void)[] buf, SocketFlags flags, Address to) @trusted {
return magic( () { return super.sendTo(buf, flags, to); }, PendingOperation.write);
}
/// ditto
- override ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags) @trusted {
+ override ptrdiff_t sendTo(scope const(void)[] buf, SocketFlags flags) @trusted {
return magic( () { return super.sendTo(buf, flags); }, PendingOperation.write);
}