Tue Oct 2 16:06:00 2001 Robert Collins <rbtcollins@hotmail.com>

        * Makefile.in: Remove cygserver_shm.o from cygwin1.dll.
        Rename cygserver_shm_outside.o to cygserver_shm.o.
        * cygserver.cc (server_request::process): Use the new client_request
        constructor.
        * cygserver_client.cc: Remove the #ifdef's stubs for the server method
        within cygwin.
        (client_request_attach_tty::client_request_attach_tty): Use the new
        client_request constructor.
        (client_request_shutdown::client_request_shutdown): Ditto.
        (client_request::client_request): Ditto.
        * cygserver_shm.cc (client_request_shm_get::serve): Remove the
        #ifdef'd stub for in-cygwin builds.
        (client_request_shm_get::client_request_shm_get): Use the new
        client_request constructor, and remove the in-cygwin variants.
        * cygserver_shm.h (class client_request_shm_get): #ifndef test the
        serve method - it's only used in cygserver.
        * shm.cc (client_request_shm_get::client_request_shm_get): New function.
        * include/cygwin/cygserver.h (request_header): New constructor.
        (class client_request): Use it.
        New constructor accepting the header size.
        #ifndef test the server method - it's only used within cygserver.
        (client_request_get_version): #ifdef test the server method.
        (client_request_shutdown): Ditto.
        (client_request_attach_tty): Ditto.

1 files changed, 5 insertions, 32 deletions

diff --git a/winsup/cygwin/cygserver_client.cc b/winsup/cygwin/cygserver_client.cc
index ef9b8706770..08361935103 100755
--- a/winsup/cygwin/cygserver_client.cc
+++ b/winsup/cygwin/cygserver_client.cc
@@ -34,22 +34,13 @@
 /* 0 = untested, 1 = running, 2 = dead */
 int cygserver_running=CYGSERVER_UNKNOWN;
 
-client_request_get_version::client_request_get_version () : client_request (CYGSERVER_REQUEST_GET_VERSION)
+client_request_get_version::client_request_get_version () : client_request (CYGSERVER_REQUEST_GET_VERSION, sizeof (version))
 {
-  header.cb = sizeof (version);
   buffer = (char *)&version;
 }
 
-#ifdef __INSIDE_CYGWIN__
-void
-client_request_get_version::serve (transport_layer_base *conn, class process_cache *cache)
-{
-}
-#endif
-
-client_request_attach_tty::client_request_attach_tty () : client_request (CYGSERVER_REQUEST_ATTACH_TTY)
+client_request_attach_tty::client_request_attach_tty () : client_request (CYGSERVER_REQUEST_ATTACH_TTY, sizeof (req))
 {
-  header.cb = sizeof (req);
   buffer = (char *)&req;
   req.pid = 0;
   req.master_pid = 0;
@@ -57,9 +48,8 @@ client_request_attach_tty::client_request_attach_tty () : client_request (CYGSER
   req.to_master = NULL;
 }
 
-client_request_attach_tty::client_request_attach_tty (DWORD npid, DWORD nmaster_pid, HANDLE nfrom_master, HANDLE nto_master) : client_request (CYGSERVER_REQUEST_ATTACH_TTY)
+client_request_attach_tty::client_request_attach_tty (DWORD npid, DWORD nmaster_pid, HANDLE nfrom_master, HANDLE nto_master) : client_request (CYGSERVER_REQUEST_ATTACH_TTY, sizeof (req))
 {
-  header.cb = sizeof (req);
   buffer = (char *)&req;
   req.pid = npid;
   req.master_pid = nmaster_pid;
@@ -67,30 +57,13 @@ client_request_attach_tty::client_request_attach_tty (DWORD npid, DWORD nmaster_
   req.to_master = nto_master;
 }
 
-#ifdef __INSIDE_CYGWIN__
-void
-client_request_attach_tty::serve (transport_layer_base *conn, class process_cache *cache)
+client_request_shutdown::client_request_shutdown () : client_request (CYGSERVER_REQUEST_SHUTDOWN, 0)
 {
-}
-#endif
-
-client_request_shutdown::client_request_shutdown () : client_request (CYGSERVER_REQUEST_SHUTDOWN)
-{
-  header.cb = 0;
   buffer = NULL;
 }
 
-#ifdef __INSIDE_CYGWIN__
-void
-client_request_shutdown::serve (transport_layer_base *conn, class process_cache *cache)
-{
-}
-#endif
-
-client_request::client_request (cygserver_request_code id)
+client_request::client_request (cygserver_request_code id, ssize_t buffer_size) : header (id, buffer_size)
 {
-  header.req_id = id;
-  header.error_code = 0;
 }
 
 client_request::~client_request ()