ChangeLogTag:Sat Jan 11 09:37:24 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

8 files changed, 121 insertions, 104 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c50d07889a..0744fb4b5e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 11 09:37:24 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS_String.cpp (wcslen_emulation): Fixed a nasty formatting
+	  glitch that made the code hard to read.  Thanks to Ruslan
+ 	  Zasukhin <sunshine@public.kherson.ua> for reporting this.
+
 Fri Jan  3 21:46:00 2003  John Michael Zorko  <j.zorko@att.net>
 
         * netsvcs/clients/Naming/Client/Makefile: Added $(ACELIB) to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 1c50d07889a..0744fb4b5e0 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sat Jan 11 09:37:24 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/OS_String.cpp (wcslen_emulation): Fixed a nasty formatting
+	  glitch that made the code hard to read.  Thanks to Ruslan
+ 	  Zasukhin <sunshine@public.kherson.ua> for reporting this.
+
 Fri Jan  3 21:46:00 2003  John Michael Zorko  <j.zorko@att.net>
 
         * netsvcs/clients/Naming/Client/Makefile: Added $(ACELIB) to
diff --git a/THANKS b/THANKS
index f46411f1451..ef8f0707d85 100644
--- a/THANKS
+++ b/THANKS
@@ -1648,7 +1648,7 @@ Max F. Bilyk <mbilyk@europe.com>
 Danile White <ygor@comcast.net>
 Andrew Marlow <apm35@student.open.ac.uk>
 Michael F"olsl <michael.foelsl@gmx.net>
-Vincent Chau <Vincent.Chau@fr.thalesgroup.com>
+Vincent Chau <vincent.chau@fr.thalesgroup.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ace/Filecache.h b/ace/Filecache.h
index 4ea4b141a76..78bedd38a64 100644
--- a/ace/Filecache.h
+++ b/ace/Filecache.h
@@ -67,18 +67,18 @@ class ACE_Filecache_Object;
  */
 class ACE_Export ACE_Filecache_Handle
 {
-
-  // (1) Get rid of the useless copying of files when reading.  Although
-  // it does make sure the file you send isn't being changed, it doesn't
-  // make sure the file is in a sensible state before sending it.
-
-  // Alternative: if the file get's trashed while it is being shipped, let
-  // the client request the file again.  The cache should have an updated
-  // copy by that point.
-
+  // (1) Get rid of the useless copying of files when reading.
+  // Although it does make sure the file you send isn't being changed,
+  // it doesn't make sure the file is in a sensible state before
+  // sending it.
+  //
+  // Alternative: if the file get's trashed while it is being shipped,
+  // let the client request the file again.  The cache should have an
+  // updated copy by that point.
+  //
   // (2) Use hashing for locating files.  This means I need a hastable
   // implementation with buckets.
-
+  //
   // (3) Only lock when absolutely necessary.  JAWS_Virtual_Filesystem was
   // rather conservative, but for some reason it still ran into problems.
   // Since this design should be simpler, problems should be easier to spot.
diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp
index cb6e8e03d0b..a7388fffd86 100644
--- a/ace/OS_String.cpp
+++ b/ace/OS_String.cpp
@@ -718,8 +718,10 @@ ACE_OS_String::wcslen_emulation (const ACE_WCHAR_T *string)
 {
   const ACE_WCHAR_T *s;
 
-  for (s = string; *s; ++s);
-    return s - string;
+  for (s = string; *s; ++s)
+    continue;
+
+  return s - string;
 }
 #endif /* !ACE_HAS_WCHAR || ACE_LACKS_WCSLEN */
 
diff --git a/docs/ACE-development-process.html b/docs/ACE-development-process.html
index cbcdfb2a0d3..7b3b369e26a 100644
--- a/docs/ACE-development-process.html
+++ b/docs/ACE-development-process.html
@@ -99,7 +99,8 @@ next kits are clean, <em>i.e.</em>, it builds and runs cleanly on all
 platforms.  The status of all ACE+TAO builds is tracked automatically
 <A HREF="http://tao.doc.wustl.edu/scoreboard/"</A>online</A>.<p>
 
-The build czar's role is to:<p>
+A comprehensive summary of the build czar's role is available <A HREF="http://www.cs.wustl.edu/~bugzilla/">online</A>.
+This role is briefly summarized below:<p>
 <ul>
   <li>Remind people to check build logs.  Developers are still
     responsible for verifying that their changes are clean.
diff --git a/docs/exceptions.html b/docs/exceptions.html
index cae40a2bb21..2c45a68166a 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -25,7 +25,7 @@ Corba Programming with C++</A> by <A
 HREF="http://www.triodia.com/staff/michi-henning.html">Michi
 Henning</A> & <A HREF="http://www.iona.com/hyplan/vinoski/">Steve
 Vinoski</A>.  Likewise, we recommend that you read the Error Handling chapter from the
-<A HREF="http://theaceorb.com/buy/index.html">TAO Developer's Guide</A>.
+<A HREF="http://www.theaceorb.com/product/">TAO Developer's Guide</A>.
 
 <P><HR><P>
 <h3>Table of Contents</h3>
diff --git a/tests/INET_Addr_Test.cpp b/tests/INET_Addr_Test.cpp
index e8a88293ae9..a444a92e57a 100644
--- a/tests/INET_Addr_Test.cpp
+++ b/tests/INET_Addr_Test.cpp
@@ -64,102 +64,104 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   int status = 0;     // Innocent until proven guilty
 
-  const char *ipv4_addresses[] = {
+  const char *ipv4_addresses[] = 
+  {
     "127.0.0.1", "138.38.180.251", "64.219.54.121", "192.0.0.1", "10.0.0.1", 0
   };
 
   ACE_INET_Addr addr;
   status |= check_type_consistency (addr);
 
-  for (int i=0; ipv4_addresses[i] != 0; i++) {
-    struct in_addr addrv4;
-    ACE_UINT32 addr32;
-
-    ACE_OS::inet_pton (AF_INET, ipv4_addresses[i], &addrv4);
-
-    ACE_OS::memcpy (&addr32, &addrv4, sizeof (addr32));
-
-    addr.set (80, ipv4_addresses[i]);
-    status |= check_type_consistency (addr);
-
-    /*
-    ** Now check to make sure get_ip_address matches and get_host_addr
-    ** matches.
-    */
-    if (addr.get_ip_address () != ACE_HTONL (addr32))
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("Error: %s failed get_ip_address() check\n")
-                    ACE_TEXT ("0x%x != 0x%x\n"),
-                    ipv4_addresses[i],
-                    addr.get_ip_address (),
-                    addr32));
-        status = 1;
-      }
-
-    if (0 != ACE_OS::strcmp (addr.get_host_addr(), ipv4_addresses[i]))
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%s failed get_host_addr() check\n")
-                    ACE_TEXT ("%s != %s\n"),
-                    ipv4_addresses[i],
-                    addr.get_host_addr (),
-                    ipv4_addresses[i]));
-        status = 1;
-      }
-
-    // Clear out the address by setting it to 1 and check
-    addr.set (0, ACE_UINT32 (1), 1);
-    status |= check_type_consistency (addr);
-    if (addr.get_ip_address () != 1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed to set address to 1\n")));
-        status = 1;
-      }
-
-    // Now set the address using a 32 bit number and check that we get
-    // the right string out of get_host_addr().
-    addr.set (80, addr32, 0); // addr32 is already in network byte order
-    status |= check_type_consistency(addr);
-
-    if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv4_addresses[i]))
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("%s failed second get_host_addr() check\n")
-                    ACE_TEXT ("%s != %s\n"),
-                    ipv4_addresses[i],
-                    addr.get_host_addr (),
-                    ipv4_addresses[i]));
-        status = 1;
-      }
-
-    // Test for ACE_INET_Addr::set_addr().
-    struct sockaddr_in sa4;
-    sa4.sin_family = AF_INET;
-    sa4.sin_addr = addrv4;
-    sa4.sin_port = ACE_HTONS(8080);
-
-    addr.set (0, ACE_UINT32 (1), 1);
-    addr.set_addr (&sa4, sizeof(sa4));
-    status |= check_type_consistency (addr);
+  for (int i=0; ipv4_addresses[i] != 0; i++) 
+    {
+      struct in_addr addrv4;
+      ACE_UINT32 addr32;
+
+      ACE_OS::inet_pton (AF_INET, ipv4_addresses[i], &addrv4);
+
+      ACE_OS::memcpy (&addr32, &addrv4, sizeof (addr32));
+
+      addr.set (80, ipv4_addresses[i]);
+      status |= check_type_consistency (addr);
+
+      /*
+      ** Now check to make sure get_ip_address matches and get_host_addr
+      ** matches.
+      */
+      if (addr.get_ip_address () != ACE_HTONL (addr32))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("Error: %s failed get_ip_address() check\n")
+                      ACE_TEXT ("0x%x != 0x%x\n"),
+                      ipv4_addresses[i],
+                      addr.get_ip_address (),
+                      addr32));
+          status = 1;
+        }
+
+      if (0 != ACE_OS::strcmp (addr.get_host_addr(), ipv4_addresses[i]))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("%s failed get_host_addr() check\n")
+                      ACE_TEXT ("%s != %s\n"),
+                      ipv4_addresses[i],
+                      addr.get_host_addr (),
+                      ipv4_addresses[i]));
+          status = 1;
+        }
+
+      // Clear out the address by setting it to 1 and check
+      addr.set (0, ACE_UINT32 (1), 1);
+      status |= check_type_consistency (addr);
+      if (addr.get_ip_address () != 1)
+        {
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed to set address to 1\n")));
+          status = 1;
+        }
+
+      // Now set the address using a 32 bit number and check that we get
+      // the right string out of get_host_addr().
+      addr.set (80, addr32, 0); // addr32 is already in network byte order
+      status |= check_type_consistency(addr);
+
+      if (0 != ACE_OS::strcmp (addr.get_host_addr (), ipv4_addresses[i]))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("%s failed second get_host_addr() check\n")
+                      ACE_TEXT ("%s != %s\n"),
+                      ipv4_addresses[i],
+                      addr.get_host_addr (),
+                      ipv4_addresses[i]));
+          status = 1;
+        }
+
+      // Test for ACE_INET_Addr::set_addr().
+      struct sockaddr_in sa4;
+      sa4.sin_family = AF_INET;
+      sa4.sin_addr = addrv4;
+      sa4.sin_port = ACE_HTONS (8080);
+
+      addr.set (0, ACE_UINT32 (1), 1);
+      addr.set_addr (&sa4, sizeof(sa4));
+      status |= check_type_consistency (addr);
     
-    if (addr.get_port_number () != 8080) 
-      {
-	ACE_ERROR ((LM_ERROR,
-		    ACE_TEXT ("ACE_INET_Addr::set_addr() ")
-		    ACE_TEXT ("failed to update port number.\n")));
-	status = 1;
-      }
-
-    if (addr.get_ip_address () != ACE_HTONL (addr32))
-      {
-	ACE_ERROR ((LM_ERROR,
-		    ACE_TEXT ("ACE_INET_Addr::set_addr() ")
-		    ACE_TEXT ("failed to update address.\n")));
-	status = 1;
-      }
-
-  }
+      if (addr.get_port_number () != 8080) 
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ACE_INET_Addr::set_addr() ")
+                      ACE_TEXT ("failed to update port number.\n")));
+          status = 1;
+        }
+
+      if (addr.get_ip_address () != ACE_HTONL (addr32))
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("ACE_INET_Addr::set_addr() ")
+                      ACE_TEXT ("failed to update address.\n")));
+          status = 1;
+        }
+
+    }
 
 #if defined (ACE_HAS_IPV6)
   if (ACE_Sock_Connect::ipv6_enabled ())