ChangeLogTag:Sat Sep 30 14:00:33 UTC 2006 Steve Huston <shuston@riverace.com>

9 files changed, 45 insertions, 26 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e8d6156ba40..af1fd5c7760 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Sat Sep 30 14:00:33 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * tests/Cached_Allocator_Test.cpp:
+        * tests/Codecs_Test.cpp:
+        * tests/Enum_Interfaces_Test.cpp:
+        * tests/Get_Opt_Test.cpp (run_test):
+        * tests/Naming_Test.cpp:
+        * tests/Reactor_Notification_Queue_Test.cpp:
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+        * tests/Timer_Queue_Reference_Counting_Test.cpp:
+          Correct logging format for wide-char build.
+
 Fri Sep 29 18:54:29 UTC 2006  Steve Huston  <shuston@riverace.com>
 
 	* ace/OS_NS_signal.inl (sigaction): In the !ACE_HAS_SIGACTION_CONSTP2
diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp
index c348398e7a9..fd8aeabd33d 100644
--- a/ACE/tests/Cached_Allocator_Test.cpp
+++ b/ACE/tests/Cached_Allocator_Test.cpp
@@ -239,15 +239,15 @@ run_main (int argc, ACE_TCHAR *argv[])
   else
     ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" (%t) Something is wrong\n")), -1);
 
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Writing to chunk 1:   %s\n"), str1));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Writing to chunk 1:   %C\n"), str1));
   ACE_OS::memcpy (ptr1, str1, chunk_size);
   ptr1[chunk_size - 1] = '\0';
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Reading from chunk 1: %s\n"), ptr1));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Reading from chunk 1: %C\n"), ptr1));
 
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Writing to chunk 3:   %s\n"), str3));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Writing to chunk 3:   %C\n"), str3));
   ACE_OS::memcpy (ptr3, str3, chunk_size);
   ptr3[chunk_size - 1] = '\0';
-  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Reading from chunk 3: %s\n"), ptr3));
+  ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Reading from chunk 3: %C\n"), ptr3));
 
   ACE_DEBUG ((LM_INFO, ACE_TEXT (" (%t) Deallocating chunk 1\n")));
   allocator.free (ptr1);
diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp
index 165ed9bfb8e..bad96176ce2 100644
--- a/ACE/tests/Codecs_Test.cpp
+++ b/ACE/tests/Codecs_Test.cpp
@@ -37,7 +37,7 @@ encode_decode_stream (const ACE_Byte* stream, size_t length)
   size_t encode_len = 0;
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Input stream = %s\n"),
+              ACE_TEXT ("Input stream = %C\n"),
               stream));
 
   ACE_Byte* encodeBuf = ACE_Base64::encode (stream, length,
@@ -49,7 +49,7 @@ encode_decode_stream (const ACE_Byte* stream, size_t length)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Base64 encoded stream = %s\n"),
+              ACE_TEXT ("Base64 encoded stream = %C\n"),
               encodeBuf));
 
 
@@ -68,7 +68,7 @@ encode_decode_stream (const ACE_Byte* stream, size_t length)
   ACE_Auto_Basic_Array_Ptr<ACE_Byte> cleanup_decodeBuf (decodeBuf);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Decoded Base64 encoded stream = %s\n"),
+              ACE_TEXT ("Decoded Base64 encoded stream = %C\n"),
               decodeBuf));
 
   for (size_t i = 0; i < length; ++i)
diff --git a/ACE/tests/Enum_Interfaces_Test.cpp b/ACE/tests/Enum_Interfaces_Test.cpp
index ef3536110f5..a81626d2330 100644
--- a/ACE/tests/Enum_Interfaces_Test.cpp
+++ b/ACE/tests/Enum_Interfaces_Test.cpp
@@ -40,10 +40,17 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_utsname uname;
   ACE_OS::uname (&uname);
+#if defined (ACE_LACKS_UTSNAME_T)
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Machine: %s running on %s\n"),
               uname.nodename, uname.machine ));
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Platform: %s, %s, %s\n"),
               uname.sysname, uname.release, uname.version ));
+#else
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Machine: %C running on %C\n"),
+              uname.nodename, uname.machine ));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Platform: %C, %C, %C\n"),
+              uname.sysname, uname.release, uname.version ));
+#endif /* ACE_LACKS_UTSNAME_T */
 
   ACE_INET_Addr *the_addr_array;
   size_t how_many = 0;
diff --git a/ACE/tests/Get_Opt_Test.cpp b/ACE/tests/Get_Opt_Test.cpp
index b34c9e64f2f..f9d4442344b 100644
--- a/ACE/tests/Get_Opt_Test.cpp
+++ b/ACE/tests/Get_Opt_Test.cpp
@@ -237,7 +237,7 @@ run_test (int& test_number, int ordering)
   int retval = 0;
 
   ACE_DEBUG ((LM_INFO,
-              " ##########   Running Tests with ordering = %s   ##########\n",
+              " ##########   Running Tests with ordering = %C   ##########\n",
               ordering == 1 ? "REQUIRE_ORDER" :
                               ordering == 2 ? "PERMUTE_ARGS" :
                                               "RETURN_IN_ORDER"));
diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp
index 571f2fc5ea0..fc752dcac43 100644
--- a/ACE/tests/Naming_Test.cpp
+++ b/ACE/tests/Naming_Test.cpp
@@ -41,7 +41,7 @@ print_time (ACE_Profile_Timer &timer,
   timer.stop ();
   timer.elapsed_time (et);
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("     *****  %s  *****     \n"), test));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("     *****  %C  *****     \n"), test));
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("real time = %f secs, user time = %f secs, system time = %f secs\n"),
               et.real_time, et.user_time, et.system_time));
@@ -168,10 +168,10 @@ test_find (ACE_Naming_Context &ns_context, int sign, int result)
             {
               if (type_out)
                 ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("Name: %s\tValue: %s\tType: %s\n"),
+                            ACE_TEXT ("Name: %C\tValue: %C\tType: %C\n"),
                             name, l_value, type_out));
               else
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name: %s\tValue: %s\n"),
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name: %C\tValue: %C\n"),
                             name, l_value));
             }
 
diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp
index 26dfb59e426..a29ab26769c 100644
--- a/ACE/tests/Reactor_Notification_Queue_Test.cpp
+++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp
@@ -162,7 +162,7 @@ Event_Handler::run (void)
   if(!done())
   {
     ACE_ERROR ((LM_ERROR,
-               ACE_TEXT ("Test %s failed due to timeout ")
+               ACE_TEXT ("Test %C failed due to timeout ")
                ACE_TEXT (" sent=%d,recv=%d \n"),
                test_name_,
                notifications_sent_,
@@ -171,7 +171,7 @@ Event_Handler::run (void)
   else
   {
     ACE_DEBUG ((LM_INFO,
-                ACE_TEXT ("Test %s passed sent=%d, recv=%d\n"),
+                ACE_TEXT ("Test %C passed sent=%d, recv=%d\n"),
                 test_name_,
                 notifications_sent_,
                 notifications_recv_));
@@ -202,7 +202,7 @@ Event_Handler::send_notifications (void)
     if(reactor()->notify (this) == -1)
     {
       ACE_ERROR((LM_ERROR,
-                 ACE_TEXT ("Cannot send notifications in %s test (%d/%d)\n"),
+                 ACE_TEXT ("Cannot send notifications in %C test (%d/%d)\n"),
                  test_name_, i, notifications_curr_));
       return;
     }
@@ -210,7 +210,7 @@ Event_Handler::send_notifications (void)
     ++notifications_sent_;
   }
   //  ACE_ERROR((LM_ERROR,
-  //                "Started iteration with %d notify() calls in test %s\n",
+  //                "Started iteration with %d notify() calls in test %C\n",
   //                notifications_curr_, test_name_));
   notifications_curr_ *= 2;
 }
diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
index 1e947135d6d..4f542d78eaa 100644
--- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
+++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp
@@ -120,7 +120,7 @@ Reference_Counted_Event_Handler::handle_input (ACE_HANDLE)
   buf[message_size] = '\0';
 
   ACE_DEBUG ((LM_DEBUG,
-              "Message received: %s\n",
+              "Message received: %C\n",
               buf));
 
   return 0;
@@ -151,7 +151,7 @@ Reference_Counted_Event_Handler::handle_timeout (const ACE_Time_Value &,
                                                  const void *arg)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %s is %d\n",
+              "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %C is %d\n",
               (const char *) arg,
               this->reference_count_.value ()));
 
@@ -497,7 +497,7 @@ Simple_Event_Handler::handle_input (ACE_HANDLE)
   buf[message_size] = '\0';
 
   ACE_DEBUG ((LM_DEBUG,
-              "Message received: %s\n",
+              "Message received: %C\n",
               buf));
 
   return 0;
@@ -527,7 +527,7 @@ Simple_Event_Handler::handle_timeout (const ACE_Time_Value &,
                                       const void *arg)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "Simple_Event_Handler::handle_timeout() for arg = %s\n",
+              "Simple_Event_Handler::handle_timeout() for arg = %C\n",
               (const char *) arg));
 
   --this->events_;
@@ -771,7 +771,7 @@ Closed_In_Upcall_Event_Handler::handle_input (ACE_HANDLE)
   buf[message_size] = '\0';
 
   ACE_DEBUG ((LM_DEBUG,
-              "Message received: %s\n",
+              "Message received: %C\n",
               buf));
 
   return 0;
diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
index f21585938d0..08fbe99698a 100644
--- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
+++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp
@@ -84,7 +84,7 @@ Reference_Counted_Event_Handler::handle_timeout (const ACE_Time_Value &,
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %s is %d\n",
+                "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %C is %d\n",
                 (const char *) arg,
                 this->reference_count_.value ()));
 
@@ -220,7 +220,7 @@ template <class TIMER_QUEUE>
 cancellation_test<TIMER_QUEUE>::cancellation_test (const char *timer_queue_type)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\nCancellation test for %s\n\n",
+              "\nCancellation test for %C\n\n",
               timer_queue_type));
 
   int configs[][5] = {
@@ -383,7 +383,7 @@ template <class TIMER_QUEUE>
 expire_test<TIMER_QUEUE>::expire_test (const char *timer_queue_type)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\nExpire test for %s\n\n",
+              "\nExpire test for %C\n\n",
               timer_queue_type));
 
   TIMER_QUEUE timer_queue;
@@ -403,7 +403,7 @@ template <class TIMER_QUEUE>
 upcall_test<TIMER_QUEUE>::upcall_test (const char *timer_queue_type)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\nOne upcall test for %s\n\n",
+              "\nOne upcall test for %C\n\n",
               timer_queue_type));
 
   TIMER_QUEUE timer_queue;
@@ -447,7 +447,7 @@ Simple_Event_Handler::handle_timeout (const ACE_Time_Value &,
 {
   if (debug)
     ACE_DEBUG ((LM_DEBUG,
-                "Simple_Event_Handler::handle_timeout() for arg = %s\n",
+                "Simple_Event_Handler::handle_timeout() for arg = %C\n",
                 (const char *) arg));
   return 0;
 }
@@ -530,7 +530,7 @@ template <class TIMER_QUEUE>
 simple_test<TIMER_QUEUE>::simple_test (const char *timer_queue_type)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\nSimple test for %s\n\n",
+              "\nSimple test for %C\n\n",
               timer_queue_type));
 
   TIMER_QUEUE timer_queue;