[PATCH 6/6] server: Remove the no longer used accept_into_socket request.

Zebediah Figura z.figura12 at gmail.com
Thu Oct 1 23:14:02 CDT 2020


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 server/protocol.def |  7 -------
 server/sock.c       | 23 -----------------------
 2 files changed, 30 deletions(-)

diff --git a/server/protocol.def b/server/protocol.def
index 6534092f2cc..16c0b936743 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1383,13 +1383,6 @@ enum server_fd_type
 @END
 
 
-/* Accept into an initialized socket */
- at REQ(accept_into_socket)
-    obj_handle_t lhandle;       /* handle to the listening socket */
-    obj_handle_t ahandle;       /* handle to the accepting socket */
- at END
-
-
 /* Set socket event parameters */
 @REQ(set_socket_event)
     obj_handle_t  handle;        /* handle to the socket */
diff --git a/server/sock.c b/server/sock.c
index 360bf756f96..4f97fe72080 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1446,29 +1446,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s
     return create_named_object( root, &socket_device_ops, name, attr, sd );
 }
 
-/* accept a socket into an initialized socket */
-DECL_HANDLER(accept_into_socket)
-{
-    struct sock *sock, *acceptsock;
-    const int all_attributes = FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES|FILE_READ_DATA;
-
-    if (!(sock = (struct sock *)get_handle_obj( current->process, req->lhandle,
-                                                all_attributes, &sock_ops)))
-        return;
-
-    if (!(acceptsock = (struct sock *)get_handle_obj( current->process, req->ahandle,
-                                                      all_attributes, &sock_ops)))
-    {
-        release_object( sock );
-        return;
-    }
-
-    if (accept_into_socket( sock, acceptsock ))
-        acceptsock->wparam = req->ahandle;  /* wparam for message is the socket handle */
-    release_object( acceptsock );
-    release_object( sock );
-}
-
 /* set socket event parameters */
 DECL_HANDLER(set_socket_event)
 {
-- 
2.28.0




More information about the wine-devel mailing list