CE stuff.

1 files changed, 16 insertions, 13 deletions

diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 199dba96fc7..8baa173a691 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -57,17 +57,18 @@ ACE_Service_Manager::open (const ACE_INET_Addr &sia)
 }
 
 int 
-ACE_Service_Manager::info (char **strp, size_t length) const
+ACE_Service_Manager::info (ASYS_TCHAR **strp, size_t length) const
 {
   ACE_TRACE ("ACE_Service_Manager::info");
   ACE_INET_Addr sa;
-  char buf[BUFSIZ];
+  ASYS_TCHAR buf[BUFSIZ];
 
   if (this->acceptor_.get_local_addr (sa) == -1)
     return -1;
   
-  ACE_OS::sprintf (buf, "%d/%s %s", sa.get_port_number (), "tcp", 
-	     "# lists all services in the daemon\n");
+  ACE_OS::sprintf (buf, ASYS_TEXT ("%d/%s %s"), sa.get_port_number (),
+                   ASYS_TEXT ("tcp"), 
+                   ASYS_TEXT ("# lists all services in the daemon\n"));
 
   if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0)
     return -1;
@@ -77,11 +78,11 @@ ACE_Service_Manager::info (char **strp, size_t length) const
 }
 
 int
-ACE_Service_Manager::init (int argc, char *argv[])
+ACE_Service_Manager::init (int argc, ASYS_TCHAR *argv[])
 {
   ACE_TRACE ("ACE_Service_Manager::init");
   ACE_INET_Addr local_addr (ACE_Service_Manager::DEFAULT_PORT_);
-  ACE_Get_Opt	getopt (argc, argv, "dp:s:", 0); // Start at argv[0]
+  ACE_Get_Opt	getopt (argc, argv, ASYS_TEXT ("dp:s:"), 0); // Start at argv[0]
 
   for (int c; (c = getopt ()) != -1; )
      switch (c)
@@ -100,10 +101,11 @@ ACE_Service_Manager::init (int argc, char *argv[])
        }
   
   if (this->open (local_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("open")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                       ASYS_TEXT ("open")), -1);
   else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("registering service with ACE_Reactor\n")), -1);
   return 0;
 }
 
@@ -155,7 +157,7 @@ ACE_Service_Manager::list_services (void)
        sri.advance ())
     {
       int len = ACE_OS::strlen (sr->name ()) + 1;
-      char buf[BUFSIZ], *p = buf + len;
+      ASYS_TCHAR buf[BUFSIZ], *p = buf + len;
 
       ACE_OS::strcpy (buf, sr->name ());
       p[-1] = ' ';
@@ -165,11 +167,12 @@ ACE_Service_Manager::list_services (void)
 
       if (this->debug_)
 	ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("len = %d, info = %s%s"),
-		   len, buf, buf[len - 1] == '\n' ? "" : "\n"));
+		   len, buf, buf[len - 1] == '\n' ? ASYS_TEXT ("") : ASYS_TEXT ("\n")));
 
       if (len > 0)
 	{
-	  ssize_t n = this->client_stream_.send_n (buf, len);
+	  ssize_t n = this->client_stream_.send_n (ASYS_MULTIBYTE_STRING (buf),
+                                                   len);
 
 	  if (n != len || (n == -1 && errno != EPIPE))
 	    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("send_n")));
@@ -241,7 +244,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
     {
     case -1:
       if (this->debug_)
-	ACE_DEBUG ((LM_ERROR, "%p\n", "recv"));
+	ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("recv")));
       break;
     case 0:
       return 0;
@@ -275,7 +278,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE)
       }
     }
   if (this->client_stream_.close () == -1 && this->debug_)
-    ACE_DEBUG ((LM_ERROR, "%p\n", "close"));
+    ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("close")));
 
   return 0;
 }