Tue Nov 12 09:56:49 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Log_Msg.cpp:
          Fixed logging of stack trace on Windows with wchar enabled

        * ace/Stack_Trace.h:
          Fixed incorrect log msg format mask

        * docs/bczar/bczar.html:
          Added package

        * tests/Proactor_Scatter_Gather_Test.cpp:
        * tests/Proactor_Test.cpp:
        * tests/Proactor_Test_IPV6.cpp:
        * tests/Proactor_Timer_Test.cpp:
        * tests/Proactor_UDP_Test.cpp:
          Added missing newline

        * tests/UUID_Test.cpp:
        * tests/Wild_Match_Test.cpp:
          Fixed logging in case of unicode

11 files changed, 43 insertions, 17 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 892cfb795ea..32c5aafae23 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,25 @@
+Tue Nov 12 09:56:49 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.cpp:
+          Fixed logging of stack trace on Windows with wchar enabled
+
+        * ace/Stack_Trace.h:
+          Fixed incorrect log msg format mask
+
+        * docs/bczar/bczar.html:
+          Added package
+
+        * tests/Proactor_Scatter_Gather_Test.cpp:
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp:
+        * tests/Proactor_Timer_Test.cpp:
+        * tests/Proactor_UDP_Test.cpp:
+          Added missing newline
+
+        * tests/UUID_Test.cpp:
+        * tests/Wild_Match_Test.cpp:
+          Fixed logging in case of unicode
+
 Tue Nov 12 08:44:04 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/bczar/bczar.html:
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 47b3f535c1f..840865c110b 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -2072,7 +2072,11 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                   {
                     // skip the frame that we're currently in
                     ACE_Stack_Trace t(2);
+#if defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+                    ACE_OS::strcpy (fp, ACE_TEXT ("S"));
+#else /* ACE_WIN32 && ACE_USES_WCHAR */
                     ACE_OS::strcpy (fp, ACE_TEXT ("s"));
+#endif /* ACE_WIN32 && ACE_USES_WCHAR */
                     if (can_check)
                       this_len = ACE_OS::snprintf
                         (bp, bspace, format, t.c_str ());
diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h
index 96d24c183c4..e99526ac151 100644
--- a/ACE/ace/Stack_Trace.h
+++ b/ACE/ace/Stack_Trace.h
@@ -43,7 +43,7 @@
  *     ACELIB_DEBUG((LM_DEBUG, "%?"));
  *
  *     ACE_Stack_Trace st;
- *     ACELIB_DEBUG ((LM_DEBUG, "%s", st.c_str() ));
+ *     ACELIB_DEBUG ((LM_DEBUG, "%C", st.c_str() ));
  *  \endcode
  *
  *  These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp.
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index bc16035d74a..b53721c5f6a 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -118,7 +118,7 @@
           </ul>
           If you want to perform a full build with qt support, than run:
           <ul>
-            <li><code>yum install openssl-devel.i686 xerces-c-devel.i686 glibc-devel.i686 libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython NetworkManager wget mailx</code></li>
+            <li><code>yum install zlib-devel.i686 openssl-devel.i686 xerces-c-devel.i686 glibc-devel.i686 libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython NetworkManager wget mailx</code></li>
           </ul>
         </li>
         <li>
diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
index 24ed7f5d075..09913ac3763 100644
--- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp
+++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp
@@ -1482,7 +1482,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Asynchronous Scatter/Gather IO is unsupported.\n")
-              ACE_TEXT ("Proactor_Scatter_Gather_Test will not be run.")));
+              ACE_TEXT ("Proactor_Scatter_Gather_Test will not be run.\n")));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index 84d4138d8fa..bae860317d6 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -1936,7 +1936,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Threads or Asynchronous IO is unsupported.\n")
-              ACE_TEXT ("Proactor_Test will not be run.")));
+              ACE_TEXT ("Proactor_Test will not be run.\n")));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index 3e65149eb41..4e70f78efb1 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -1982,7 +1982,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Threads or Asynchronous IO is unsupported.\n")
-              ACE_TEXT ("Proactor_Test will not be run.")));
+              ACE_TEXT ("Proactor_Test_IPV6 will not be run.\n")));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp
index 86469c4dd40..3d472648435 100644
--- a/ACE/tests/Proactor_Timer_Test.cpp
+++ b/ACE/tests/Proactor_Timer_Test.cpp
@@ -351,7 +351,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Asynchronous IO is unsupported.\n")
-              ACE_TEXT ("Proactor_Timer_Test will not be run.")));
+              ACE_TEXT ("Proactor_Timer_Test will not be run.\n")));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp
index c880b687ca6..587737720ee 100644
--- a/ACE/tests/Proactor_UDP_Test.cpp
+++ b/ACE/tests/Proactor_UDP_Test.cpp
@@ -2204,7 +2204,7 @@ run_main (int, ACE_TCHAR *[])
 
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Threads or Asynchronous IO is unsupported.\n")
-              ACE_TEXT ("Proactor_UDP_Test will not be run.")));
+              ACE_TEXT ("Proactor_UDP_Test will not be run.\n")));
 
   ACE_END_TEST;
 
diff --git a/ACE/tests/UUID_Test.cpp b/ACE/tests/UUID_Test.cpp
index 3ef3eaffa85..30c029b63eb 100644
--- a/ACE/tests/UUID_Test.cpp
+++ b/ACE/tests/UUID_Test.cpp
@@ -32,14 +32,14 @@ Tester::test (void)
   auto_ptr <ACE_Utils::UUID> uuid (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ());
   ACE_CString uuid_str (uuid->to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Generated UUID\n %s\n"),
+              ACE_TEXT ("Generated UUID\n %C\n"),
               uuid_str.c_str ()));
 
   // Construct UUID from string
   ACE_Utils::UUID new_uuid (uuid_str);
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("UUID Constructed from above Generated UUID\n %s\n"),
+              ACE_TEXT ("UUID Constructed from above Generated UUID\n %C\n"),
               new_uuid.to_string ()->c_str ()));
 
   // Construct UUID from string by assigning it
@@ -47,7 +47,7 @@ Tester::test (void)
   new_uuid_assign.from_string (new_uuid.to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("UUID Constructed from above Generated UUID ")
-              ACE_TEXT ("with assign\n %s\n"),
+              ACE_TEXT ("with assign\n %C\n"),
               new_uuid_assign.to_string ()->c_str ()));
 
   if (new_uuid != new_uuid_assign)
@@ -67,7 +67,7 @@ Tester::test (void)
   ACE_Utils::UUID new_uuid_copy (new_uuid);
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("UUID constructed from above Generated UUID")
-              ACE_TEXT (" with copy\n %s\n"),
+              ACE_TEXT (" with copy\n %C\n"),
               new_uuid_copy.to_string ()->c_str ()));
 
   if (new_uuid != new_uuid_copy)
@@ -79,7 +79,7 @@ Tester::test (void)
   ACE_Utils::UUID nil_uuid (*ACE_Utils::UUID::NIL_UUID.to_string ());
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("UUID Constructed from NIL_UUID with ")
-              ACE_TEXT ("string copy\n %s\n"),
+              ACE_TEXT ("string copy\n %C\n"),
               nil_uuid.to_string ()->c_str ()));
 
   if (nil_uuid != ACE_Utils::UUID::NIL_UUID)
@@ -93,7 +93,7 @@ Tester::test (void)
   new_uuid_assigment = new_uuid;
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("UUID Constructed from above Generated UUID ")
-              ACE_TEXT ("with assignment\n %s\n"),
+              ACE_TEXT ("with assignment\n %C\n"),
               new_uuid_assigment.to_string ()->c_str ()));
 
   if (new_uuid != new_uuid_assigment)
@@ -107,7 +107,7 @@ Tester::test (void)
     uuid_with_tp_id (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID (0x0001, 0xc0));
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("UUID with Thread and Process ID\n %s\n"),
+              ACE_TEXT ("UUID with Thread and Process ID\n %C\n"),
               uuid_with_tp_id->to_string ()->c_str ()));
 
   if (new_uuid == *uuid_with_tp_id)
@@ -119,7 +119,7 @@ Tester::test (void)
   ACE_Utils::UUID new_uuid_with_tp_id (uuid_with_tp_id->to_string ()->c_str ());
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("UUID with Thread and Process ID reconstructed ")
-              ACE_TEXT ("from above UUID \n %s\n"),
+              ACE_TEXT ("from above UUID \n %C\n"),
               new_uuid_with_tp_id.to_string ()->c_str ()));
 
   return retval;
@@ -131,7 +131,7 @@ int run_main(int, ACE_TCHAR* [])
 
   Tester tester;
 
-  int result = tester.test();
+  int const result = tester.test();
 
   if (result == 0)
     ACE_DEBUG((LM_DEBUG,
diff --git a/ACE/tests/Wild_Match_Test.cpp b/ACE/tests/Wild_Match_Test.cpp
index 387f6324b8f..7d8f78b75d1 100644
--- a/ACE/tests/Wild_Match_Test.cpp
+++ b/ACE/tests/Wild_Match_Test.cpp
@@ -7,7 +7,7 @@
 bool match (const char *str, const char *pat, bool cs = true, bool cc = false)
 {
   bool const result = ACE::wild_match (str, pat, cs, cc);
-  ACE_DEBUG ((LM_DEBUG, "string {%C} %C pattern {%s}\t%C\t%C\n", str,
+  ACE_DEBUG ((LM_DEBUG, "string {%C} %C pattern {%C}\t%C\t%C\n", str,
               (result ? "matches" : "does not match"), pat,
               (cs ? "" : "case-insensitive"), (cc ? "char classes" : "")));
   return result;