.

3 files changed, 25 insertions, 28 deletions

diff --git a/README b/README
index 4e3ef5ede01..754551405b2 100644
--- a/README
+++ b/README
@@ -834,6 +834,8 @@ Alain Magloire <alain@qnx.com>
 Jim Rogers <jrogers@viasoft.com>
 Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com>
 David Brownell <david-b@pacbell.net>
+Richard Stallman <rms@gnu.org>
+Casey Lucas <clucas@sabre.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index b7f7c71a6f7..5b8ec387ecb 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -56,10 +56,9 @@ Mon May 10 12:47:29 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 Mon May 10 11:43:04 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * COPYING:
-
-          Made some updates suggested by Richard Stallman of the Free
-          Software Foundation (http://www.fsf.org/).
+        * COPYING: Made some updates suggested by Richard Stallman
+ 	  <rms@gnu.org> of the Free Software Foundation
+ 	  (http://www.fsf.org/).
 
 Mon May 10 08:24:20 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 60f1cf69802..341863d32c4 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -126,35 +126,31 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[])
 
   if (ip_addr == 0) // Assume it's a port number.
     {
-      // Check to see if this is a port number.
-      if (ACE_OS::strspn (t,
-                          "1234567890") == ACE_OS::strlen (t))
-        { 
+      if (ACE_OS::strspn (t, "1234567890") 
+          == ACE_OS::strlen (t))
+        { // port number
           u_short port = (u_short) ACE_OS::atoi (t);
-          result = this->set (port, ACE_UINT32 (INADDR_ANY));
-        }
-      // Otherwise, it's a port name.
-      else 
-        {
-          *ip_addr++ = '\0'; // skip over ':'
-
-          // Check to see if this is a port number.
-          if (ACE_OS::strspn (ip_addr,
-                              "1234567890") == ACE_OS::strlen (ip_addr))
-            { 
-              u_short port = (u_short) ACE_OS::atoi (ip_addr);
-              result = this->set (port, t);
-            }
-          // Otherwise, it's a port name.
-          else
-            result = this->set (ip_addr, t);
+          result = this->set (port,
+                              ACE_UINT32 (INADDR_ANY));
         }
+      else // port name
+        result = this->set (t, 
+                            ACE_UINT32 (INADDR_ANY));
     }
   else
     {
-      *ip_addr = '\0';
-      u_short port = (u_short) ACE_OS::atoi (ip_addr + 1); // Skip over ':'
-      result = this->set (port, t);
+      *ip_addr = '\0'; ++ip_addr; // skip over ':'
+
+      if (ACE_OS::strspn (ip_addr,
+                         "1234567890") ==          
+          ACE_OS::strlen (ip_addr))
+        {
+          u_short port = 
+            (u_short) ACE_OS::atoi (ip_addr);
+          result = this->set (port, t);
+        }
+      else
+        result = this->set (ip_addr, t);
     }
 
   ACE_OS::free (ACE_MALLOC_T (t));