.

6 files changed, 188 insertions, 93 deletions

diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 593ca2b55a4..c7f14ea7afd 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -104,7 +104,8 @@ NAMING_CONTEXT (void)
 
 Client_Test::Client_Test (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "Client_Test::Client_Test\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "Client_Test::Client_Test\n"));
 }
 
 int
@@ -125,7 +126,10 @@ Client_Test::open (void)
   if (ACE_Event_Handler::register_stdin_handler (this,
 						 ACE_Reactor::instance (),
 						 ACE_Thread_Manager::instance ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_stdin_handler"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "register_stdin_handler"),
+                      -1);
   return 0;
 }
 
@@ -142,7 +146,8 @@ Client_Test::close (void)
 int
 Client_Test::fini (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "Client_Test::fini\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "Client_Test::fini\n"));
   return this->close ();
 }
 
@@ -158,10 +163,10 @@ Client_Test::handle_input (ACE_HANDLE)
   char input[1024];
 
   if (::scanf ("%s", option) <= 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p Try again!\n",
-                         "Client_Test::handle_input"), 0);
-    }
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Try again!\n",
+                       "Client_Test::handle_input"),
+                      0);
 
   int result = -1;
 
@@ -187,13 +192,17 @@ Client_Test::handle_input (ACE_HANDLE)
         {
           ACE_OS::strcpy (buf1, temp_buf);
 
+          temp_buf = ACE_OS::strtok (0, " ");
+
           // get the value
-          if ((temp_buf = ACE_OS::strtok (0, " ")))
+          if (temp_buf)
             {
               ACE_OS::strcpy (buf2, temp_buf);
 
-              // get the type (if entered)
-              if ((temp_buf = ACE_OS::strtok (0, " ")))
+              temp_buf = ACE_OS::strtok (0, " ");
+
+              // get the type (if entered).
+              if (temp_buf)
                 {
                   ACE_OS::strcpy (buf3, temp_buf);
                   result = this->bind (buf1, buf2, buf3);
@@ -202,10 +211,12 @@ Client_Test::handle_input (ACE_HANDLE)
                 result = this->bind (buf1, buf2);
             }
           else
-            ACE_ERROR ((LM_ERROR, "Bind Failed! Value not entered.\n"));
+            ACE_ERROR ((LM_ERROR,
+                        "Bind Failed! Value not entered.\n"));
         }
       else
-        ACE_ERROR ((LM_ERROR, "Bind Failed! Key and Value not entered.\n"));
+        ACE_ERROR ((LM_ERROR,
+                    "Bind Failed! Key and Value not entered.\n"));
       break;
     case 'u' :
       if (::scanf ("%s", buf1) <= 0)
@@ -216,18 +227,22 @@ Client_Test::handle_input (ACE_HANDLE)
       // get the input from stdin
       ACE_OS::fgets (input, sizeof input, stdin);
 
+      temp_buf = ACE_OS::strtok (input, " ");
       // get the key
-      if ((temp_buf = ACE_OS::strtok (input, " ")))
+      if (temp_buf)
         {
           ACE_OS::strcpy (buf1, temp_buf);
 
+          temp_buf = ACE_OS::strtok (0, " ");
+
           // get the value
-          if ((temp_buf = ACE_OS::strtok (0, " ")))
+          if (temp_buf)
             {
               ACE_OS::strcpy (buf2, temp_buf);
 
+              temp_buf = ACE_OS::strtok (0, " ");
               // get the type (if entered)
-              if ((temp_buf = ACE_OS::strtok (0, " ")))
+              if (temp_buf)
                 {
                   ACE_OS::strcpy (buf3, temp_buf);
                   result = this->rebind (buf1, buf2, buf3);
@@ -236,10 +251,12 @@ Client_Test::handle_input (ACE_HANDLE)
                 result = this->rebind (buf1, buf2);
             }
           else
-            ACE_ERROR ((LM_ERROR, "Rebind Failed! Value not entered.\n"));
+            ACE_ERROR ((LM_ERROR,
+                        "Rebind Failed! Value not entered.\n"));
         }
       else
-        ACE_ERROR ((LM_ERROR, "Reind Failed! Key and value not entered.\n"));
+        ACE_ERROR ((LM_ERROR,
+                    "Reind Failed! Key and value not entered.\n"));
       break;
     case 'f' :
       if (::scanf ("%s", buf1) <= 0)
@@ -286,7 +303,8 @@ Client_Test::handle_input (ACE_HANDLE)
       result = this->quit ();
       break;
     default :
-      ACE_DEBUG ((LM_DEBUG, "Unrecognized command.\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Unrecognized command.\n"));
     }
 
   this->display_menu ();
@@ -320,27 +338,30 @@ Client_Test::display_menu (void)
 void
 Client_Test::list_options (void)
 {
-//  ACE_DEBUG ((LM_DEBUG, "  *** Process Name is %s ***\n",
-//            this->name_options_->process_name ()));
   switch (this->name_options_->context ())
     {
     case ACE_Naming_Context::PROC_LOCAL:
-      ACE_DEBUG ((LM_DEBUG, "  *** Using Process Local Database\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "  *** Using Process Local Database\n"));
       break;
     case ACE_Naming_Context::NODE_LOCAL:
-      ACE_DEBUG ((LM_DEBUG, "  *** Using Node Local Database\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "  *** Using Node Local Database\n"));
       break;
     case ACE_Naming_Context::NET_LOCAL:
-      ACE_DEBUG ((LM_DEBUG, "  *** Hostname: %s\n",
+      ACE_DEBUG ((LM_DEBUG,
+                  "  *** Hostname: %s\n",
                   this->name_options_->nameserver_host ()));
-      ACE_DEBUG ((LM_DEBUG, "  *** Port Number: %d\n",
+      ACE_DEBUG ((LM_DEBUG,
+                  "  *** Port Number: %d\n",
                   this->name_options_->nameserver_port ()));
       break;
     default:
       assert (!"shouldn't occur!\n");
       /* NOTREACHED */
     }
-  ACE_DEBUG ((LM_DEBUG, "  *** Namespace directory is %s ***\n",
+  ACE_DEBUG ((LM_DEBUG,
+              "  *** Namespace directory is %s ***\n",
               this->name_options_->namespace_dir ()));
 }
 
@@ -389,8 +410,11 @@ int
 Client_Test::bind (char* key, char* value, char* type)
 {
   if (NAMING_CONTEXT ()->bind (key, value, type) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Bind failed! Key %s exists\n",
-                       "Client_Test::bind", key), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Bind failed! Key %s exists\n",
+                       "Client_Test::bind",
+                       key),
+                      0);
   return 0;
 }
 
@@ -398,8 +422,11 @@ int
 Client_Test::unbind (char* key)
 {
   if (NAMING_CONTEXT ()->unbind (key) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Unbind failed! Key %s not found\n",
-                       "Client_Test::unbind", key), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Unbind failed! Key %s not found\n",
+                       "Client_Test::unbind",
+                       key),
+                      0);
   return 0;
 }
 
@@ -416,8 +443,10 @@ Client_Test::list_names (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_names (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_names"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_names"),
+                      0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -425,7 +454,9 @@ Client_Test::list_names (char *pattern)
       for (ACE_WString *name = 0;
            set_iterator.next (name) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG, "%s\n", name->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s\n",
+                    name->char_rep ()));
     }
   return 0;
 }
@@ -436,8 +467,10 @@ Client_Test::list_values (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_values (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_values"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_values"),
+                      0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -445,7 +478,9 @@ Client_Test::list_values (char *pattern)
       for (ACE_WString *value = 0;
            set_iterator.next (value) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG, "%s\n", value->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s\n",
+                    value->char_rep ()));
     }
   return 0;
 }
@@ -456,8 +491,10 @@ Client_Test::list_types (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_types (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_types"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_types"),
+                      0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -465,7 +502,9 @@ Client_Test::list_types (char *pattern)
       for (ACE_WString *type = 0;
            set_iterator.next (type) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG, "%s\n", type->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG,
+                    "%s\n",
+                    type->char_rep ()));
     }
   return 0;
 }
@@ -476,8 +515,10 @@ Client_Test::list_name_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_name_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_names"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_names"),
+                      0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -486,10 +527,16 @@ Client_Test::list_name_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->value_.char_rep ()));
           if (entry->type_)
-            ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s\n",
+                        entry->type_));
         }
     }
   return 0;
@@ -501,8 +548,10 @@ Client_Test::list_value_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_value_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_values"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_values"),
+                      0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -510,10 +559,16 @@ Client_Test::list_value_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->value_.char_rep ()));
           if (entry->type_)
-            ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s\n",
+                        entry->type_));
         }
     }
   return 0;
@@ -525,8 +580,10 @@ Client_Test::list_type_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_type_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
-                       "Client_Test::list_types"), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Pattern matching failed!\n",
+                       "Client_Test::list_types"),
+                      0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -535,15 +592,20 @@ Client_Test::list_type_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\t",
+                      entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG,
+                      "%s\n",
+                      entry->type_));
         }
     }
   return 0;
 }
 
-
 int
 Client_Test::find (char *key)
 {
@@ -551,20 +613,24 @@ Client_Test::find (char *key)
   char *type = 0;
 
   if (NAMING_CONTEXT ()->resolve (key, value, type) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p Find failed! Key %s not found\n",
-                       "Client_Test::list_find", key), 0);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p Find failed! Key %s not found\n",
+                       "Client_Test::list_find",
+                       key),
+                      0);
   else
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Binding for %s : value = %s\ttype = %s\n",
-                  key, value, type));
+                  key,
+                  value,
+                  type));
       if (type)
         delete [] type;
       return 0;
     }
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Dynamic_Service<ACE_Naming_Context>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/netsvcs/clients/Naming/Client/Client_Test.h b/netsvcs/clients/Naming/Client/Client_Test.h
index d0b3a1dba9d..36ac6a097ea 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.h
+++ b/netsvcs/clients/Naming/Client/Client_Test.h
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/netsvcs/clients/Naming/README b/netsvcs/clients/Naming/Client/README
index 7e461560cb6..68e69b6b3bf 100644
--- a/netsvcs/clients/Naming/README
+++ b/netsvcs/clients/Naming/Client/README
@@ -1,9 +1,7 @@
-This directory contains a set of tests for the ACE_Name_Server
-library.  There are two directories -- client and server, which test
-the client and server, respectively.  In addition, these tests
-illustrate how to use the ACE Service_Config mechanism, which enables
-the client and server code to be dynamically linked into the process
-at installation-time or run-time!
+This directory contains a test for the ACE_Name_Server library.  This
+test program also illustrates how to use the ACE Service_Config
+mechanism, which enables the client code to be dynamically linked into
+the process at installation-time or run-time.
 
 The client test is an application that allows the user to vary the
 test parameters through the following menu driven interface:
@@ -72,10 +70,9 @@ types. Note that pattern matching is supported using regular expressions.
 -------------------------
 Running the tests:
 
-Both the client and the server test programs use DLL supported by
-svc.conf which allows them to configure the client-side and the
-server-side (respectively) dynamically. The client test program
-accomplishes this by making use of a Singleton proxy object
+The test program uses a DLL supported by the svc.conf file, which
+allows them to configure the client-side dynamically.  The client test
+program accomplishes this by making use of a Singleton proxy object
 (Name_Service) to provide an interface to the client-side.
 
 The test programs rely on svc.conf to provide the necessary parameters
@@ -119,6 +116,8 @@ database needs to be accessed.  The server test needs to run on the
 machine that contains the net local database.  To execute the server
 test, the user has to specify the port number at which the server will
 be listening in the svc.conf file.  An implementation of a name
-service for ACE is available in the $ACE_ROOT/netsvcs/bin
-directory.  Please see the README file there for an explanation of how
-to run the server.
+service for ACE is available in the $ACE_ROOT/netsvcs/{lib,servers}
+directories.  Please see the README files there for an explanation of
+how to run the server.
+
+
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 6321fbe161f..7dedde59b5f 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -16,7 +16,10 @@ main (int argc, char *argv[])
   if (daemon.open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR ((LM_ERROR, "%p\n%a", "open", 1));
+	ACE_ERROR ((LM_ERROR,
+                    "%p\n%a",
+                    "open",
+                    1));
       else // Use static binding.
 	{
 	  char *l_argv[3];
@@ -26,12 +29,18 @@ main (int argc, char *argv[])
 	  ACE_Service_Object *so = ACE_SVC_INVOKE (ACE_Naming_Context);
 
 	  if (so->init (2, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "ACE_Naming_Context", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "ACE_Naming_Context",
+                        1));
 
 	  so = ACE_SVC_INVOKE (Client_Test);
 
 	  if (so->init (0, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Client_Test", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Client_Test",
+                        1));
 	}
     }
 
diff --git a/netsvcs/clients/Naming/Dump_Restore/README b/netsvcs/clients/Naming/Dump_Restore/README
index 3bb13935d87..25b1243d03f 100644
--- a/netsvcs/clients/Naming/Dump_Restore/README
+++ b/netsvcs/clients/Naming/Dump_Restore/README
@@ -1,9 +1,8 @@
 This file describes the usage of the Dump-Restore utility for the ACE
 Name Server.
 
-Similar to the test application provided in the Client-Server
-directory, a simple ASCII menu-driven interface is provided to the
-user:
+Similar to the test application provided in the ../Client/ directory,
+a simple ASCII menu-driven interface is provided to the user:
 
          Name Service Main Menu
          ----------------------
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index d8ea477d343..dd21ed1cf58 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -23,20 +23,26 @@ main (int argc, char *argv[])
 
   // Register ourselves to receive signals so we can shut down
   // gracefully.
-  if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n"), -1);
+  if (ACE_Reactor::instance ()->register_handler (sig_set,
+                                                  &sa) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n"),
+                      -1);
 
   // Try to link in the svc.conf entries dynamically.
   if (ACE_Service_Config::open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "open"),
+                          1);
       else // Use static linking.
 	{
 	  char *l_argv[3];
 
           // Calling ACE_SVC_INVOKE to create a new Service_Object.
-          // Stash the newly created Service_Object into an 
+          // Stash the newly created Service_Object into an
           // ACE_Service_Object_Ptr which is an <auto_ptr> specialized
           // for ACE_Service_Object.
 
@@ -45,14 +51,19 @@ main (int argc, char *argv[])
 	  ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
 
 	  if (sp_1->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Name Service", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Name Service",
+                        1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR;
 	  l_argv[1] = 0;
 	  ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
 
 	  if (sp_2->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "TS Server Acceptor", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "TS Server Acceptor", 1));
 
 	  l_argv[0] = argv[0];
 	  l_argv[1] = "-p 10011";
@@ -67,41 +78,53 @@ main (int argc, char *argv[])
 	  ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
 
 	  if (sp_4->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Token Service", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Token Service",
+                        1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
 	  l_argv[1] = 0;
 	  ACE_Service_Object_Ptr sp_5 = ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
 
 	  if (sp_5->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Threaded Logging Server", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Threaded Logging Server",
+                        1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
 	  l_argv[1] = 0;
 	  ACE_Service_Object_Ptr sp_6 = ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
 
 	  if (sp_6->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Logging Server", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Logging Server", 1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
 	  l_argv[1] = 0;
 	  ACE_Service_Object_Ptr sp_7 = ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
 
 	  if (sp_7->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Logging Client", 1));
+	    ACE_ERROR ((LM_ERROR,
+                        "%p\n%a",
+                        "Logging Client",
+                        1));
 
-	  // Run forever, performing the configured services until we are shut
-	  // down by a SIGINT/SIGQUIT signal.
+	  // Run forever, performing the configured services until we
+	  // are shut down by a SIGINT/SIGQUIT signal.
 
 	  ACE_Reactor::run_event_loop ();
 
-	  // Destructors of ACE_Service_Object_Ptr's automagically call fini().
+	  // Destructors of ACE_Service_Object_Ptr's automagically
+	  // call fini().
 	}
     }
   else // Use dynamic linking.
 
-    // Run forever, performing the configured services until we are shut
-    // down by a SIGINT/SIGQUIT signal.
+    // Run forever, performing the configured services until we are
+    // shut down by a SIGINT/SIGQUIT signal.
 
     ACE_Reactor::run_event_loop ();