Thu Jun 23 14:51:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/CE_Screen_Output.h:
        * ace/Log_Msg.cpp:
        * netsvcs/clients/Logger/direct_logging.cpp:
        * netsvcs/clients/Logger/indirect_logging.cpp:
        * netsvcs/lib/Base_Optimizer.h:
        * netsvcs/lib/Base_Optimizer.cpp:
        * netsvcs/lib/Client_Logging_Handler.cpp:
        * netsvcs/lib/Log_Message_Receiver.h:
        * netsvcs/lib/Log_Message_Receiver.cpp:
        * netsvcs/lib/Server_Logging_Handler.cpp:
        * netsvcs/lib/Server_Logging_Handler_T.cpp:
        * netsvcs/lib/TS_Clerk_Handler.cpp:
        * netsvcs/lib/TS_Server_Handler.cpp:
        * netsvcs/lib/Time_Request_Reply.cpp:
        * netsvcs/lib/lib.mpc:
        * netsvcs/servers/README:
        * netsvcs/servers/main.cpp:
          Layout and typo fixes

18 files changed, 30 insertions, 40 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b1e033e872a..b4a8c122569 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Thu Jun 23 14:51:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CE_Screen_Output.h:
+        * ace/Log_Msg.cpp:
+        * netsvcs/clients/Logger/direct_logging.cpp:
+        * netsvcs/clients/Logger/indirect_logging.cpp:
+        * netsvcs/lib/Base_Optimizer.h:
+        * netsvcs/lib/Base_Optimizer.cpp:
+        * netsvcs/lib/Client_Logging_Handler.cpp:
+        * netsvcs/lib/Log_Message_Receiver.h:
+        * netsvcs/lib/Log_Message_Receiver.cpp:
+        * netsvcs/lib/Server_Logging_Handler.cpp:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/TS_Clerk_Handler.cpp:
+        * netsvcs/lib/TS_Server_Handler.cpp:
+        * netsvcs/lib/Time_Request_Reply.cpp:
+        * netsvcs/lib/lib.mpc:
+        * netsvcs/servers/README:
+        * netsvcs/servers/main.cpp:
+          Layout and typo fixes
+
 Thu Jun 23 14:29:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/bczar/bczar.html:
diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h
index e3ca13de295..7654e3a3c8a 100644
--- a/ACE/ace/CE_Screen_Output.h
+++ b/ACE/ace/CE_Screen_Output.h
@@ -39,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This class allows standard text output to be displayed on
  * text window for Windows CE.  Generally, all ACE output will
- * go through under CE if and only if user uses WindozeCE
+ * go through under CE if and only if user uses Windows CE
  * implementation by using main_ce instead of main.
  * Also, for the easier debugging purpose, object pointer of
  * this class can be gotten from ACE_Log_Msg::msg_callback()
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index a204f89e414..72499eccb0d 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1751,7 +1751,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   else
                     this_len = ACE_OS::sprintf
                       (bp, format, (unsigned long)t_id);
-#  endif /* ACE_MWS || ACE_TANDEM_T1248_PTHREADS */
+#  endif /* ACE_TANDEM_T1248_PTHREADS */
 
 #endif /* ACE_WIN32 */
                   ACE_UPDATE_COUNT (bspace, this_len);
diff --git a/ACE/netsvcs/clients/Logger/direct_logging.cpp b/ACE/netsvcs/clients/Logger/direct_logging.cpp
index ec0a18de465..652e70a8c72 100644
--- a/ACE/netsvcs/clients/Logger/direct_logging.cpp
+++ b/ACE/netsvcs/clients/Logger/direct_logging.cpp
@@ -11,8 +11,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/CDR_Stream.h"
 
-
-
 static u_short LOGGER_PORT = ACE_DEFAULT_SERVER_PORT;
 static const ACE_TCHAR *const LOGGER_HOST = ACE_DEFAULT_SERVER_HOST;
 static const ACE_TCHAR *const DATA = ACE_TEXT ("hello world\n");
diff --git a/ACE/netsvcs/clients/Logger/indirect_logging.cpp b/ACE/netsvcs/clients/Logger/indirect_logging.cpp
index 1d7223ece28..bac237e2d7d 100644
--- a/ACE/netsvcs/clients/Logger/indirect_logging.cpp
+++ b/ACE/netsvcs/clients/Logger/indirect_logging.cpp
@@ -10,8 +10,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Log_Record.h"
 
-
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
diff --git a/ACE/netsvcs/lib/Base_Optimizer.cpp b/ACE/netsvcs/lib/Base_Optimizer.cpp
index 159c4a0f79b..e1155dd6e44 100644
--- a/ACE/netsvcs/lib/Base_Optimizer.cpp
+++ b/ACE/netsvcs/lib/Base_Optimizer.cpp
@@ -5,8 +5,6 @@
 
 #include "Base_Optimizer.h"
 
-
-
 template<class Base, class Member>
 Base_Optimizer<Base, Member>::Base_Optimizer (void)
 {
diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h
index 87c19185d3b..eb8319de769 100644
--- a/ACE/netsvcs/lib/Base_Optimizer.h
+++ b/ACE/netsvcs/lib/Base_Optimizer.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef BASE_OPTIMIZER_H
 #define BASE_OPTIMIZER_H
 
@@ -23,7 +22,6 @@
 /**
  * @class Base_Optimizer
  *
- *
  * Thanks to Nathan Myers and Fergus Henderson for this little
  * beauty.
  */
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index 18349dfd9af..8fd68f7cfa2 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -31,7 +31,6 @@ ACE_Client_Logging_Handler::ACE_Client_Logging_Handler (ACE_HANDLE output_handle
 }
 
 // This is called when a <send> to the logging server fails...
-
 int
 ACE_Client_Logging_Handler::handle_signal (int signum,
                                            siginfo_t *,
@@ -44,7 +43,6 @@ ACE_Client_Logging_Handler::handle_signal (int signum,
 }
 
 // This function is called every time a client connects to us.
-
 int
 ACE_Client_Logging_Handler::open (void *)
 {
@@ -87,7 +85,6 @@ ACE_Client_Logging_Handler::get_handle (void) const
 }
 
 // Receive a logging record from an application.
-
 int
 ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 {
@@ -303,7 +300,6 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 
 // Receive a logging record from an application send via a non-0
 // MSG_BAND...  This just calls handle_input().
-
 int
 ACE_Client_Logging_Handler::handle_exception (ACE_HANDLE handle)
 {
@@ -311,7 +307,6 @@ ACE_Client_Logging_Handler::handle_exception (ACE_HANDLE handle)
 }
 
 // Called when object is removed from the ACE_Reactor
-
 int
 ACE_Client_Logging_Handler::close (u_long)
 {
diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.cpp b/ACE/netsvcs/lib/Log_Message_Receiver.cpp
index 87883affd20..a50aeaacbee 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.cpp
@@ -6,8 +6,6 @@
 #include "ace/Log_Msg.h"
 #include "Log_Message_Receiver.h"
 
-
-
 // Type based log message receiver
 template<ACE_SYNCH_DECL> void
 Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname,
diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h
index 8c3570a6ed2..e6730a6458c 100644
--- a/ACE/netsvcs/lib/Log_Message_Receiver.h
+++ b/ACE/netsvcs/lib/Log_Message_Receiver.h
@@ -79,7 +79,7 @@
 //  be possible to write more complex LMRs, like one that creates
 //  a new log file each day or keeps a fixed size, round robin,
 //  log file. It should also be possible to have separate LMRs
-//  of the same type that uses differnt log files.
+//  of the same type that uses different log files.
 //
 // ==========================================================================//
 
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler.cpp b/ACE/netsvcs/lib/Server_Logging_Handler.cpp
index f9b47fec142..0fdccbc523c 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Server_Logging_Handler.cpp
@@ -5,12 +5,9 @@
 
 #include "Server_Logging_Handler.h"
 
-
-
 // The following are "Factories" used by the ACE_Service_Config and
 // svc.conf file to dynamically initialize the state of the
 // single-threaded and multi-threaded logging server.
-
 ACE_SVC_FACTORY_DEFINE (ACE_Server_Logging_Acceptor)
 ACE_SVC_FACTORY_DEFINE (ACE_Thr_Server_Logging_Acceptor)
 
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
index 14b572b95ec..e4ffdc9772e 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -10,8 +10,6 @@
 #include "Server_Logging_Handler_T.h"
 #include "ace/Signal.h"
 
-
-
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
 // Track number of requests.
 template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_DECL, class LMR>
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
index d1fd46feddd..ed1058f64f6 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -8,8 +8,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/os_include/os_netdb.h"
 
-
-
 ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor,
                                             ACE_INET_Addr &addr)
 : state_ (ACE_TS_Clerk_Handler::IDLE),
diff --git a/ACE/netsvcs/lib/TS_Server_Handler.cpp b/ACE/netsvcs/lib/TS_Server_Handler.cpp
index c8eb7ac3ed6..c79b82f48f1 100644
--- a/ACE/netsvcs/lib/TS_Server_Handler.cpp
+++ b/ACE/netsvcs/lib/TS_Server_Handler.cpp
@@ -7,8 +7,6 @@
 #include "ace/OS_NS_time.h"
 #include "ace/Signal.h"
 
-
-
 int
 ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[])
 {
diff --git a/ACE/netsvcs/lib/Time_Request_Reply.cpp b/ACE/netsvcs/lib/Time_Request_Reply.cpp
index 7811a5c5477..83b43e89652 100644
--- a/ACE/netsvcs/lib/Time_Request_Reply.cpp
+++ b/ACE/netsvcs/lib/Time_Request_Reply.cpp
@@ -9,17 +9,13 @@
 
 #include "Time_Request_Reply.h"
 
-
-
 // Default "do nothing" constructor.
-
 ACE_Time_Request::ACE_Time_Request (void)
 {
   ACE_TRACE ("ACE_Time_Request::ACE_Time_Request");
 }
 
 // Create a ACE_Time_Request message.
-
 ACE_Time_Request::ACE_Time_Request (ACE_INT32 t, // Type of request.
                                     const time_t time,
                                     ACE_Time_Value *timeout) // Max time waiting for request.
diff --git a/ACE/netsvcs/lib/lib.mpc b/ACE/netsvcs/lib/lib.mpc
index c7ea51d458f..45c2cf9a2ef 100644
--- a/ACE/netsvcs/lib/lib.mpc
+++ b/ACE/netsvcs/lib/lib.mpc
@@ -14,9 +14,9 @@ project(netsvcs): ace_output, acelib {
     Log_Message_Receiver.cpp
     Server_Logging_Handler.cpp
     Token_Handler.cpp
-    Base_Optimizer.cpp
   }
   Template_Files {
+    Base_Optimizer.cpp
     Server_Logging_Handler_T.cpp
   }
 }
diff --git a/ACE/netsvcs/servers/README b/ACE/netsvcs/servers/README
index f6fa4a19557..fcab03dc49a 100644
--- a/ACE/netsvcs/servers/README
+++ b/ACE/netsvcs/servers/README
@@ -14,20 +14,20 @@ program by changing how the svc.conf file is setup:
 	  and single-threaded implementations are provided.
 
 	. Client_Logging_Handler.* -- Implements the client portion
-	  of the ACE distributed logging service.  Note that you 
+	  of the ACE distributed logging service.  Note that you
           generally will run a netsvc daemon that's configured with
           *either* the server portion of the logging service or the
           client portion of the logging service, but not both in
-          the same process.  In otherwords, you'll need to have
+          the same process.  In other words, you'll need to have
           separate svc.conf files to configure the client logging process
-          and the server logging process indepedently.
+          and the server logging process independently.
 
 	. Name_Handler.* -- Implements a distributed name service that
 	  allows applications to bind, find, and unbind names in
 	  a distributed system.
 
 	. Token_Handler.* -- Implements a distributed token service
-	  that allows distributed applications to acquire and release 
+	  that allows distributed applications to acquire and release
 	  locks in a distributed system.
 
 	. Time_Handler.* -- Implements a distributed time service that
diff --git a/ACE/netsvcs/servers/main.cpp b/ACE/netsvcs/servers/main.cpp
index bf640d9094b..5763af2a092 100644
--- a/ACE/netsvcs/servers/main.cpp
+++ b/ACE/netsvcs/servers/main.cpp
@@ -10,8 +10,6 @@
 #include "Token_Handler.h"
 #include "Server_Logging_Handler.h"
 
-
-
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
@@ -164,8 +162,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Register ourselves to receive signals so we can shut down
       // gracefully.
-      if (ACE_Reactor::instance ()->register_handler (sig_set,
-                                                      &sa) == -1)
+      if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1)
         ACE_ERROR ((LM_ERROR,
                     ACE_TEXT ("%p\n"),
                     ACE_TEXT ("register signals2")));