* cygserver_client.cc (client_request::make_request): Comment out

	a verbose tracing statement.
	* cygserver_process.cc (process_cache::sync_wait_array): Fix
	broken assert.
	* include/cygwin/cygserver.h (class client_request): Remove excess
	use of `class' qualifier in declarations.
	(class client_request_get_version): Ditto.
	(class client_request_shutdown): Ditto.
	(class client_request_attach_tty): Ditto.

4 files changed, 21 insertions, 9 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 88f24726a..cf6abf523 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,17 @@
 2002-06-28  Conrad Scott  <conrad.scott@dsl.pipex.com>
 
+	* cygserver_client.cc (client_request::make_request): Comment out
+	a verbose tracing statement.
+	* cygserver_process.cc (process_cache::sync_wait_array): Fix
+	broken assert.
+	* include/cygwin/cygserver.h (class client_request): Remove excess
+	use of `class' qualifier in declarations.
+	(class client_request_get_version): Ditto.
+	(class client_request_shutdown): Ditto.
+	(class client_request_attach_tty): Ditto.
+
+2002-06-28  Conrad Scott  <conrad.scott@dsl.pipex.com>
+
 	* cygserver_ipc.h: New file.
 	* cygserver_shm.h: Re-written from scratch.
 	* cygserver_shm.cc: Ditto.
diff --git a/winsup/cygwin/cygserver_client.cc b/winsup/cygwin/cygserver_client.cc
index 723716e0c..c63a61a84 100755
--- a/winsup/cygwin/cygserver_client.cc
+++ b/winsup/cygwin/cygserver_client.cc
@@ -342,7 +342,7 @@ client_request::make_request ()
       return -1;
     }
 
-  class transport_layer_base * const transport = create_server_transport ();
+  transport_layer_base *const transport = create_server_transport ();
 
   assert (transport);
 
@@ -361,7 +361,7 @@ client_request::make_request ()
       return -1;
     }
 
-  debug_printf ("connected to server %p", transport);
+  // verbose: debug_printf ("connected to server %p", transport);
 
   send (transport);
 
diff --git a/winsup/cygwin/cygserver_process.cc b/winsup/cygwin/cygserver_process.cc
index 5f0094064..3859c4377 100755
--- a/winsup/cygwin/cygserver_process.cc
+++ b/winsup/cygwin/cygserver_process.cc
@@ -304,7 +304,7 @@ process_cache::sync_wait_array (const HANDLE interrupt_event)
 
   EnterCriticalSection (&_cache_write_access);
 
-  assert (_processes_count + SPECIALS_COUNT < elements (_wait_array));
+  assert (_processes_count + SPECIALS_COUNT <= elements (_wait_array));
 
   size_t index = 0;
 
diff --git a/winsup/cygwin/include/cygwin/cygserver.h b/winsup/cygwin/include/cygwin/cygserver.h
index 0e5d32f61..80298f3f8 100755
--- a/winsup/cygwin/include/cygwin/cygserver.h
+++ b/winsup/cygwin/include/cygwin/cygserver.h
@@ -67,7 +67,7 @@ protected:
 
 public:
 #ifndef __INSIDE_CYGWIN__
-  static void handle_request (transport_layer_base *, class process_cache *);
+  static void handle_request (transport_layer_base *, process_cache *);
 #endif
 
   client_request (request_code_t request_code,
@@ -94,8 +94,8 @@ private:
   const size_t _buflen;
 
 #ifndef __INSIDE_CYGWIN__
-  void handle (transport_layer_base *, class process_cache *);
-  virtual void serve (transport_layer_base *, class process_cache *) = 0;
+  void handle (transport_layer_base *, process_cache *);
+  virtual void serve (transport_layer_base *, process_cache *) = 0;
 #endif
 };
 
@@ -122,7 +122,7 @@ private:
   struct request_get_version version;
 
 #ifndef __INSIDE_CYGWIN__
-  virtual void serve (transport_layer_base *, class process_cache *);
+  virtual void serve (transport_layer_base *, process_cache *);
 #endif
 };
 
@@ -141,7 +141,7 @@ public:
   client_request_shutdown ();
 
 private:
-  virtual void serve (transport_layer_base *, class process_cache *);
+  virtual void serve (transport_layer_base *, process_cache *);
 };
 
 #endif /* !__INSIDE_CYGWIN__ */
@@ -177,7 +177,7 @@ private:
   struct request_attach_tty req;
 
 #ifndef __INSIDE_CYGWIN__
-  virtual void serve (transport_layer_base *, class process_cache *);
+  virtual void serve (transport_layer_base *, process_cache *);
 #endif
 };