ChangeLogTag:Thu Jan 29 14:10:27 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

14 files changed, 27 insertions, 34 deletions

diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp
index bdca8d2d02e..85846a00f41 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp
@@ -244,7 +244,7 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open - "),
+                         ACE_TEXT ("DIOP_Acceptor::open - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -358,7 +358,7 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open_default - "),
+                         ACE_TEXT ("DIOP_Acceptor::open_default - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -429,7 +429,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
-                      this->hosts_[i],
+                      ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -713,7 +713,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               opt.c_str ()),
+                               ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -729,14 +729,13 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
-                                 value.c_str ()),
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
                                 -1);
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"),
-                               name.c_str ()),
+                               ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())),
                               -1);
         }
     }
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index bd65c8fec3b..bba8297505f 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -120,7 +120,7 @@ TAO_DIOP_Connection_Handler::open (void*)
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -")
                  ACE_TEXT("listening on: <%s:%u>\n"),
-                 this->local_addr_.get_host_name (),
+                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
                  this->local_addr_.get_port_number ()));
   }
 
@@ -141,7 +141,7 @@ TAO_DIOP_Connection_Handler::open_server (void)
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -")
                  ACE_TEXT("listening on %s:%d\n"),
-                 this->local_addr_.get_host_name (),
+                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
                  this->local_addr_.get_port_number ()
                ));
   }
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index ae98edfdffd..50961d1eb82 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -353,7 +353,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
   else
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body ",
+                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
                   "no object key marshalled \n"));
     }
 
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index d4edd4c8c80..849240d6b7c 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -116,7 +116,7 @@ TAO_DIOP_Transport::recv (char *buf,
       ACE_DEBUG ((LM_DEBUG,
                   "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n",
                   n,
-                  from_addr.get_host_name (),
+                  ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()),
                   from_addr.get_port_number (),
                   errno));
     }
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 2bb6169d174..91e607e38a9 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -253,7 +253,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) - ")
-                         ACE_TEXT ("SCIOP_Acceptor::open, "),
+                         ACE_TEXT ("SCIOP_Acceptor::open, ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -493,7 +493,7 @@ TAO_SCIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("SCIOP_Acceptor::open_default - "),
+                         ACE_TEXT ("SCIOP_Acceptor::open_default - ")
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
@@ -1029,8 +1029,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
-                                 value.c_str ()),
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
                                 -1);
             }
           else if (name == "portspan")
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 59bef91749c..d01935260ac 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -393,7 +393,7 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
   else
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - IIOP_Profile::create_profile_body ",
+                  "(%P|%t) TAO - IIOP_Profile::create_profile_body "
                   "no object key marshalled \n"));
     }
 
diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp
index c888ec4e1d1..f5664f2e4af 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -212,7 +212,7 @@ TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream,
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::send_message, ")
-                    ACE_TEXT (" write failure - %p\n"),
+                    ACE_TEXT (" write failure - %m\n"),
                     this->id ()));
       return -1;
     }
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index da2edda4bbf..6655a560bfd 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -503,8 +503,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_LIB_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ")
-                                 ACE_LIB_TEXT ("endpoint priorities no longer supported. \n"),
-                                 value.c_str ()),
+                                 ACE_LIB_TEXT ("endpoint priorities no longer supported. \n")),
                                 -1);
             }
           else
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index b8c1aa11b2a..770feceb3f9 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -203,11 +203,9 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) %s:%u, connection to ")
-                      ACE_TEXT ("<%s:%p> failed (%p)\n"),
-                      __FILE__,
-                      __LINE__,
-                      shmiop_endpoint->host (),
+                      ACE_TEXT ("(%P|%t) %N:%l, connection to ")
+                      ACE_TEXT ("<%s:%u> failed (%p)\n"),
+                      ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
                       shmiop_endpoint->port (),
                       ACE_TEXT ("errno")));
         }
@@ -221,7 +219,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
                 "new connection to <%s:%d> on Transport[%d]\n",
-                shmiop_endpoint->host (), shmiop_endpoint->port (),
+                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                shmiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
 
   TAO_Transport *transport =
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 4c0a462bc68..88d8413d197 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -394,7 +394,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
   else
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body ",
+                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
                   "no object key marshalled \n"));
     }
 
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 9ac84d9fae6..dcebc0befe7 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -515,8 +515,7 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
-                                 ACE_TEXT ("endpoint priorities no longer supported. \n"),
-                                 value.c_str ()),
+                                 ACE_TEXT ("endpoint priorities no longer supported. \n")),
                                 -1);
             }
           else
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index fe21b22e61f..34f9ba7c37d 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -279,10 +279,8 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level)
         {
           ACE_DEBUG ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) %s:%u, connection to ")
+                      ACE_TEXT ("(%P|%t) %N:%l, connection to ")
                       ACE_TEXT ("%s failed (%p)\n"),
-                      __FILE__,
-                      __LINE__,
                       uiop_endpoint->rendezvous_point (),
                       ACE_TEXT ("errno")));
         }
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index b8aaf43922b..85c3531ffa2 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -297,7 +297,7 @@ TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
   else
     {
       ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) TAO - UIOP_Profile::create_profile_body ",
+                  "(%P|%t) TAO - UIOP_Profile::create_profile_body "
                   "no object key marshalled \n"));
     }
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index 88c1b2ab71f..c559bf6a983 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -564,8 +564,8 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_LIB_TEXT("TAO (%P|%t) Unable to load ")
-                             ACE_LIB_TEXT("protocol <%s>, %p\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), ""),
+                             ACE_LIB_TEXT("protocol <%s>, %m\n"),
+                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
                             -1);
         }