Tue Feb 6 16:33:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 25 insertions, 49 deletions

diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
index 9b7d02c3e4a..a4c4cc1b67d 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -25,7 +25,7 @@ ACE_RCSID (Strategies,
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SCIOP_Endpoint::TAO_SCIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
+                                        int use_dotted_decimal_addresses)
   : TAO_Endpoint (TAO_TAG_SCIOP_PROFILE)
   , host_ ()
   , port_ (683)  // default port (IANA assigned)
@@ -249,8 +249,7 @@ TAO_SCIOP_Endpoint::object_addr (void) const
 void
 TAO_SCIOP_Endpoint::object_addr_i (void) const
 {
-  if (this->object_addr_.set (this->port_,
-                              this->host_.in ()) == -1)
+  if (this->object_addr_.set (this->port_, this->host_.in ()) == -1)
     {
       // If this call fails, it most likely due a hostname
       // lookup failure caused by a DNS misconfiguration.  If
diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp
index 8734e78cdbc..ca3dfb1c365 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -56,8 +56,7 @@ TAO_SCIOP_Protocol_Factory::make_acceptor (void)
 }
 
 int
-TAO_SCIOP_Protocol_Factory::init (int /* argc */,
-                                 ACE_TCHAR* /* argv */ [])
+TAO_SCIOP_Protocol_Factory::init (int /* argc */, ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index f306345bca0..65b0fe7b905 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -332,8 +332,7 @@ TAO_SCIOP_Transport::get_listen_point (
   // Get the local address of the connection
   ACE_INET_Addr local_addr;
 
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
+  if (this->connection_handler_->peer ().get_local_addr (local_addr) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("(%P|%t) Could not resolve local ")
@@ -358,15 +357,12 @@ TAO_SCIOP_Transport::get_listen_point (
                         -1);
     }
 
-  for (size_t index = 0;
-       index != count;
-       index++)
+  for (size_t index = 0; index != count; index++)
     {
-      if (local_addr.get_ip_address()
-          == endpoint_addr[index].get_ip_address())
+      if (local_addr.get_ip_address() == endpoint_addr[index].get_ip_address())
         {
           // Get the count of the number of elements
-          CORBA::ULong len = listen_point_list.length ();
+          CORBA::ULong const len = listen_point_list.length ();
 
           // Increase the length by 1
           listen_point_list.length (len + 1);
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index d90a04cc655..bc8a26a7ea9 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -59,13 +59,9 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
   if (priority == TAO_INVALID_PRIORITY)
-    return this->create_new_profile (object_key,
-                                     mprofile,
-                                     priority);
+    return this->create_new_profile (object_key, mprofile, priority);
   else
-    return this->create_shared_profile (object_key,
-                                        mprofile,
-                                        priority);
+    return this->create_shared_profile (object_key, mprofile, priority);
 }
 
 int
@@ -135,9 +131,7 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
     {
       // If <mprofile> doesn't contain SHMIOP_Profile, we need to create
       // one.
-      return create_new_profile (object_key,
-                                 mprofile,
-                                 priority);
+      return create_new_profile (object_key, mprofile, priority);
     }
   else
     {
@@ -232,8 +226,7 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
   //    address.
   this->host_ = this->address_.get_host_name ();
 
-  return this->open_i (orb_core,
-                       reactor);
+  return this->open_i (orb_core, reactor);
 }
 
 int
@@ -366,8 +359,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
+  if (!(cdr.read_octet (major) && cdr.read_octet (minor)))
   {
     if (TAO_debug_level > 0)
       {
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index bb99b50d002..6f66f057062 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -138,8 +138,8 @@ TAO_SHMIOP_Transport::recv (char *buf,
 }
 
 int
-TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, 
-                                    ACE_Time_Value *max_wait_time, 
+TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
+                                    ACE_Time_Value *max_wait_time,
                                     int)
 {
   if (TAO_debug_level > 3)
@@ -180,7 +180,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
 
   const size_t missing_header_data = this->messaging_object ()->header_length ();
 
-  if (missing_header_data == 0) 
+  if (missing_header_data == 0)
     {
       return -1;
     }
@@ -226,7 +226,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
                                                        mesg_length) == -1)
       return -1;
 
-    if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED) 
+    if (qd.missing_data_ == TAO_MISSING_DATA_UNDEFINED)
       {
         // parse/marshal error happened
         return -1;
@@ -237,7 +237,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
         // we read too much data
         return -1;
       }
-    
+
     if (message_block.space () < qd.missing_data_)
       {
         const size_t message_size = message_block.length ()
@@ -295,7 +295,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
     {
       return -1;
     }
-  
+
   return 0;
 }
 
@@ -362,8 +362,7 @@ int
 TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }
 
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index e44b79d4173..7224a002623 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -104,8 +104,7 @@ public:
                             ACE_Time_Value *max_time_wait = 0);
 
   /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
+  virtual int messaging_init (CORBA::Octet major, CORBA::Octet minor);
 
 private:
   /// The connection service handler used for accessing lower layer
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index c3cde036f2e..cce1c02c833 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -80,10 +80,8 @@ TAO_UIOP_Transport::send (iovec *iov, int iovcnt,
                           size_t &bytes_transferred,
                           const ACE_Time_Value *max_wait_time)
 {
-  const ssize_t retval =
-    this->connection_handler_->peer ().sendv (iov,
-                                              iovcnt,
-                                              max_wait_time);
+  ssize_t const retval =
+    this->connection_handler_->peer ().sendv (iov, iovcnt, max_wait_time);
 
   if (retval > 0)
     bytes_transferred = retval;
@@ -136,15 +134,10 @@ TAO_UIOP_Transport::send_request (TAO_Stub *stub,
                                   int message_semantics,
                                   ACE_Time_Value *max_wait_time)
 {
-  if (this->ws_->sending_request (orb_core,
-                                  message_semantics) == -1)
+  if (this->ws_->sending_request (orb_core, message_semantics) == -1)
     return -1;
 
-  if (this->send_message (stream,
-                          stub,
-                          message_semantics,
-                          max_wait_time) == -1)
-
+  if (this->send_message (stream, stub, message_semantics, max_wait_time) == -1)
     return -1;
 
   this->first_request_sent();
@@ -190,8 +183,7 @@ int
 TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
 {
-  this->messaging_object_->init (major,
-                                 minor);
+  this->messaging_object_->init (major, minor);
   return 1;
 }