*** empty log message ***

6 files changed, 12 insertions, 16 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index f2b18815818..add1663b7ca 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,16 +1,15 @@
 Fri Jul 16 19:41:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* ace/ACE.cpp (out_of_file_descriptors): Added a function to check
-	  if a process is out of file descriptors.  This is required to
-	  avoid repeating this code in many places.  Also, note that all
-	  platform specific quirks can be captured in this function.
+	* ace/ACE.cpp (out_of_handles): Added a function to check if a
+	  process is out of handles (file descriptors).  This is required
+	  to avoid repeating this code in many places.  Also, note that
+	  all platform specific quirks can be captured in this function.
 
 	* ace/Cached_Connect_Strategy_T.cpp (cached_connect):
 	* tests/Cached_Conn_Test.cpp (out_of_sockets_handler):
 	* tests/Cached_Accept_Conn_Test.cpp (out_of_sockets_handler):
 
-	  Changed the above to use the new ACE::out_of_file_descriptors()
-	  function.
+	  Changed the above to use the new ACE::out_of_handles() function.
 
 	* ace/OS.h (ENFILE): Added ENFILE if missing on platform.  In that
 	  case, ENFILE will equal to EMFILE.
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 8191a65afd0..3874cec0d45 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -31,7 +31,7 @@ size_t ACE::pagesize_ = 0;
 size_t ACE::allocation_granularity_ = 0;
 
 int
-ACE::out_of_file_descriptors (int error)
+ACE::out_of_handles (int error)
 {
   // EMFILE is common to all platforms.
   if (error == EMFILE ||
diff --git a/ace/ACE.h b/ace/ACE.h
index 59d5373d78b..88b74211d55 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -72,8 +72,9 @@ public:
   static u_int compiler_beta_version (void);
   // E.g., the "0" in SunPro C++ 4.32.0
 
-  static int out_of_file_descriptors (int error);
-  // Check if error indicates the process being out of file descriptors.
+  static int out_of_handles (int error);
+  // Check if error indicates the process being out of handles (file
+  // descriptors).
 
   // = Recv operations that factor out differences between Win32 and UNIX.
   static ssize_t recv (ACE_HANDLE handle,
diff --git a/ace/Cached_Connect_Strategy_T.cpp b/ace/Cached_Connect_Strategy_T.cpp
index f31a209340c..ffc0aa83543 100644
--- a/ace/Cached_Connect_Strategy_T.cpp
+++ b/ace/Cached_Connect_Strategy_T.cpp
@@ -230,7 +230,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cached_connect (SVC_HANDLER *&sh,
 
       if (errno == EWOULDBLOCK)
         errno = ENOTSUP;
-      else if (ACE::out_of_file_descriptors (errno))
+      else if (ACE::out_of_handles (errno))
         {
           // If the connect failed due to the process running out of
           // file descriptors then, auto_purging of some connections
diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index e6cc6c2a716..d442ec36251 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -287,9 +287,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDL
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void)
 {
-  // ENOBUFS had to be checked on NT while ENOENT check had to be
-  // added for Solaris + Linux.
-  if (ACE::out_of_file_descriptors (errno))
+  if (ACE::out_of_handles (errno))
     {
       // Close connections which are cached by explicitly purging the
       // connection cache maintained by the connector.
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index 59d47b71e7c..e74b250f550 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -174,9 +174,7 @@ static CACHED_CONNECT_STRATEGY *connect_strategy = 0;
 static void
 out_of_sockets_handler (void)
 {
-  // ENOBUFS had to be checked on NT while ENOENT check had to be added for
-  // Solaris + Linux.
-  if (ACE::out_of_file_descriptors (errno))
+  if (ACE::out_of_handles (errno))
     {
       // Close connections which are cached by explicitly purging the
       // connection cache maintained by the connector.