ChangeLogTag: Sat Dec 29 12:52:08 2001 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 31 insertions, 31 deletions

diff --git a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
index cc0256f7ec7..8c66dedfda8 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp
@@ -7,16 +7,16 @@ ACE_RCSID(SOCK_SAP, C_inclient, "$Id$")
 /* BSD socket client */
 
 int
-main (int argc, char *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   // Initialize WinSock DLL on Win32...
   ACE_OS::socket_init (ACE_WSOCK_VERSION);
 
-  struct sockaddr_in saddr;                                          
-  struct hostent *hp;                                           
-  const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
-  u_short port_num = 
-    htons (argc > 2 ? atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT);
+  struct sockaddr_in saddr;
+  struct hostent *hp;
+  const ACE_TCHAR *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
+  u_short port_num =
+    htons (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT);
   int sockbufsize = argc > 3 ? ACE_OS::atoi (argv[3]) : 0;
   char buf[BUFSIZ];
   ACE_HANDLE s_handle;
@@ -26,7 +26,7 @@ main (int argc, char *argv[])
 
   // Create a local endpoint of communication.
   if ((s_handle = ACE_OS::socket (PF_INET, SOCK_STREAM, 0)) == ACE_INVALID_HANDLE)
-    ACE_OS::perror ("socket"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("socket")), ACE_OS::exit (1);
 
   // If a sockbufsize was specified, set it for both send and receive.
   if (sockbufsize > 0)
@@ -34,16 +34,16 @@ main (int argc, char *argv[])
       if (ACE_OS::setsockopt (s_handle, SOL_SOCKET, SO_SNDBUF,
                               (const char *) &sockbufsize,
                               sizeof (sockbufsize)) != 0)
-        ACE_OS::perror ("SO_SNDBUF"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("SO_SNDBUF")), ACE_OS::exit (1);
       if (ACE_OS::setsockopt (s_handle, SOL_SOCKET, SO_RCVBUF,
                               (const char *) &sockbufsize,
                               sizeof (sockbufsize)) != 0)
-        ACE_OS::perror ("SO_RCVBUF"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("SO_RCVBUF")), ACE_OS::exit (1);
     }
 
   // Determine IP address of the server.
-  if ((hp = ACE_OS::gethostbyname (host)) == 0)
-    ACE_OS::perror ("gethostbyname"), ACE_OS::exit (1);
+  if ((hp = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host))) == 0)
+    ACE_OS::perror (ACE_TEXT("gethostbyname")), ACE_OS::exit (1);
 
   // Set up the address information to contact the server.
   ACE_OS::memset ((void *) &saddr, 0, sizeof saddr);
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
   if (ACE_OS::connect (s_handle,
 		       ACE_reinterpret_cast(sockaddr *, &saddr),
                        sizeof saddr) == -1)
-    ACE_OS::perror ("connect"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("connect")), ACE_OS::exit (1);
 
   // Send data to server (correctly handles "incomplete writes" due to
   // flow control).
@@ -64,14 +64,14 @@ main (int argc, char *argv[])
     for (w_bytes = 0; w_bytes < r_bytes; w_bytes += n)
       if ((n = ACE_OS::send (s_handle, buf + w_bytes,
                       r_bytes - w_bytes)) < 0)
-        ACE_OS::perror ("write"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("write")), ACE_OS::exit (1);
 
   if (ACE_OS::recv (s_handle, buf, 1) == 1)
     ACE_OS::write (ACE_STDOUT, buf, 1);
 
   // Explicitly close the connection.
   if (ACE_OS::closesocket (s_handle) == -1)
-    ACE_OS::perror ("close"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("close")), ACE_OS::exit (1);
 
   return 0;
 }
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
index 01c6f090592..bb9fc9d5711 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
@@ -6,7 +6,7 @@ ACE_RCSID(SOCK_SAP, C_inserver, "$Id$")
 
 /* BSD socket server. */
 
-int main (int argc, char *argv[])
+int main (int argc, ACE_TCHAR *argv[])
 {
   // Initialize WinSock DLL on Win32...
   ACE_OS::socket_init (ACE_WSOCK_VERSION);
@@ -19,7 +19,7 @@ int main (int argc, char *argv[])
 
   /* Create a local endpoint of communication */
   if ((s_handle = ACE_OS::socket (PF_INET, SOCK_STREAM, 0)) == ACE_INVALID_HANDLE)
-    ACE_OS::perror ("socket"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("socket")), ACE_OS::exit (1);
 
   // If a sockbufsize was specified, set it for both send and receive.
   if (sockbufsize > 0)
@@ -27,11 +27,11 @@ int main (int argc, char *argv[])
       if (ACE_OS::setsockopt (s_handle, SOL_SOCKET, SO_SNDBUF,
                               (const char *) &sockbufsize,
                               sizeof (sockbufsize)) != 0)
-        ACE_OS::perror ("SO_SNDBUF"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("SO_SNDBUF")), ACE_OS::exit (1);
       if (ACE_OS::setsockopt (s_handle, SOL_SOCKET, SO_RCVBUF,
                               (const char *) &sockbufsize,
                               sizeof (sockbufsize)) != 0)
-        ACE_OS::perror ("SO_RCVBUF"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("SO_RCVBUF")), ACE_OS::exit (1);
     }
 
   /* Set up the address information to become a server */
@@ -44,11 +44,11 @@ int main (int argc, char *argv[])
   if (ACE_OS::bind (s_handle,
                     ACE_reinterpret_cast(struct sockaddr *, &saddr),
                     sizeof saddr) == -1)
-    ACE_OS::perror ("bind"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("bind")), ACE_OS::exit (1);
 
   /* Make endpoint listen for service requests */
   if (ACE_OS::listen (s_handle, 5) == -1)
-    ACE_OS::perror ("listen"), ACE_OS::exit (1);
+    ACE_OS::perror (ACE_TEXT("listen")), ACE_OS::exit (1);
 
   /* Performs the iterative server activities */
 
@@ -71,7 +71,7 @@ int main (int argc, char *argv[])
 
       if (n_handle == ACE_INVALID_HANDLE)
         {
-          ACE_OS::perror ("accept");
+          ACE_OS::perror (ACE_TEXT("accept"));
           continue;
         }
 
@@ -87,13 +87,13 @@ int main (int argc, char *argv[])
       if (hp != 0)
         ACE_OS::printf ("client %s\n", hp->h_name), ACE_OS::fflush (stdout);
       else
-        ACE_OS::perror ("gethostbyaddr");
+        ACE_OS::perror (ACE_TEXT("gethostbyaddr"));
 
       /* Read data from client (terminate on error) */
 
       while ((r_bytes = ACE_OS::recv (n_handle, buf, sizeof buf)) > 0)
         if (ACE_OS::write (ACE_STDOUT, buf, r_bytes) != r_bytes)
-          ACE_OS::perror ("write"), ACE_OS::exit (1);
+          ACE_OS::perror (ACE_TEXT("write")), ACE_OS::exit (1);
 
       if (ACE_OS::send (n_handle, "", 1) != 1)
         ::perror ("write"), ACE_OS::exit (1);
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
       /* Close the new endpoint
          (listening endpoint remains open) */
       if (ACE_OS::closesocket (n_handle) == -1)
-        ACE_OS::perror ("close"), ACE_OS::exit (1);
+        ACE_OS::perror (ACE_TEXT("close")), ACE_OS::exit (1);
       ACE_OS::exit (0);
     }
 
diff --git a/examples/Mem_Map/file-reverse/file-reverse.cpp b/examples/Mem_Map/file-reverse/file-reverse.cpp
index 5b78d7f4297..9817df77224 100644
--- a/examples/Mem_Map/file-reverse/file-reverse.cpp
+++ b/examples/Mem_Map/file-reverse/file-reverse.cpp
@@ -35,7 +35,7 @@ print_array_in_reverse (char *array,
 }
 
 int
-main (int argc, char **argv)
+main (int argc, ACE_TCHAR **argv)
 {
   ACE_LOG_MSG->open (argv[0]);
 
@@ -45,9 +45,9 @@ main (int argc, char **argv)
                       -1);
 
   ACE_Mem_Map mmap;
-  
+
   if (mmap.map (argv[1], -1, O_RDWR) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
+    ACE_ERROR_RETURN ((LM_ERROR,
                        "%n: %p\n",
                        "mmap"),
                       -1);
diff --git a/examples/Reactor/Multicast/Log_Wrapper.cpp b/examples/Reactor/Multicast/Log_Wrapper.cpp
index 60ffa40fd1d..89759e5f2c5 100644
--- a/examples/Reactor/Multicast/Log_Wrapper.cpp
+++ b/examples/Reactor/Multicast/Log_Wrapper.cpp
@@ -27,7 +27,7 @@ Log_Wrapper::open (const int port, const char *mcast_addr)
   if (ACE_OS::uname (&host_data) < 0)
     return -1;
 
-  if ((host_info = ACE_OS::gethostbyname (host_data.nodename)) == NULL)
+  if ((host_info = ACE_OS::gethostbyname (ACE_TEXT_ALWAYS_CHAR(host_data.nodename))) == NULL)
     return -1;
   else
     ACE_OS::memcpy ((char *) &this->log_msg_.host,
diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp
index f3c4aca5ef5..4fc45ac1b8a 100644
--- a/examples/Reactor/Multicast/server.cpp
+++ b/examples/Reactor/Multicast/server.cpp
@@ -168,13 +168,13 @@ Server_Events::handle_input (ACE_HANDLE)
       total_bytes_received_ += retcode;
       last_sequence_number_ =
         ntohl (log_record_->sequence_number);
-      
+
       for (char *message_end = this->message_ + ACE_OS::strlen (this->message_) - 1;
            ACE_OS::strchr ("\r\n \t", *message_end) != 0;
            )
         {
           *message_end-- = '\0';
-          if (message_end == this->message_) 
+          if (message_end == this->message_)
             break;
         }
 
@@ -207,7 +207,7 @@ Server_Events::handle_input (ACE_HANDLE)
 }
 
 int
-main (int, char *[])
+main (int, ACE_TCHAR *[])
 {
   // Instantiate a server which will receive messages for DURATION
   // seconds.