Mon Oct 13 07:22:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 37 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index dec58bb8a8c..6884ca0825f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Mon Oct 13 07:22:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IOR_Multicast.cpp
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp
+        * orbsvcs/cheduling_Service/Scheduling_Service.cpp
+        * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+          ACE_TCHAR fixes
+
 Sun Oct 12 23:11:45 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/Concurrency_Service/Concurrency_Service.cpp
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 04feffad481..84294849ce7 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -110,8 +110,8 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
       CORBA::String_var scheduler_ior_string =
         orb->object_to_string (scheduler.in ());
 
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"),
-                            ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%C>\n"),
+                            scheduler_ior_string.in ()));
 
       // Register the servant with the Naming Context....
       CosNaming::Name schedule_name (1);
@@ -125,8 +125,8 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
           if (iorf != 0)
             {
               ACE_OS::fprintf (iorf,
-                               ACE_TEXT("%s\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ()));
+                               "%s\n",
+                               scheduler_ior_string.in ());
               ACE_OS::fclose (iorf);
             }
         }
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index ea2ad6e1df8..747a031b5ce 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -126,7 +126,7 @@ TAO_IOR_Multicast::common_init (const char *ior,
       if (this->mcast_dgram_.join (this->mcast_addr_,
                                    1,
                                    ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"),-1);
+      ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "join"),-1);
     }
   else
     {
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 6caa6e23a28..f7c6fa79081 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -177,8 +177,8 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *,
       if (TAO_debug_level > 3)
           ACE_ERROR ((LM_ERROR,
                       "TAO (%P|%t) - UIPMC_Connector::make_connection, "
-                      "connection to <%s:%u> failed (%p)\n",
-                      ACE_TEXT_CHAR_TO_TCHAR (uipmc_endpoint->host ()),
+                      "connection to <%C:%u> failed (%p)\n",
+                      uipmc_endpoint->host (),
                       uipmc_endpoint->port (),
                       ACE_TEXT ("errno")));
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
index d765e1823db..7d382399e0d 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp
@@ -181,8 +181,8 @@ RTCosScheduling_ClientScheduler_i::tasks (
     {
       /// Error return of we cannot open the file.
       ACE_ERROR_RETURN ((LM_ERROR,
-                        "Could not find the config file %s, aborting\n",
-                        ACE_TEXT_CHAR_TO_TCHAR (file_name)),
+                        "Could not find the config file %C, aborting\n",
+                        file_name),
                         0);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index c2e336f1a8c..0b748403cb5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -444,16 +444,16 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info,
     default:
 
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("unrecognized dependency type %d for %s\n"),
-                  d.dependency_type, ACE_TEXT_CHAR_TO_TCHAR(rt_info->entry_point.in ())));
+                  ACE_TEXT("unrecognized dependency type %d for %C\n"),
+                  d.dependency_type, rt_info->entry_point.in ()));
       return -1;
   }
 
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT("Sched (%t) adding %s dependency to caller: %s\n"),
+              ACE_TEXT("Sched (%t) adding %s dependency to caller: %C\n"),
               (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL)
                               ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")),
-              ACE_TEXT_CHAR_TO_TCHAR(temp_info->entry_point.in ())));
+              temp_info->entry_point.in ()));
 
   RtecScheduler::Dependency_Set& set = temp_info->dependencies;
   int l = set.length();
@@ -1549,8 +1549,8 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
           ACE_DEBUG (
              (LM_DEBUG,
               ACE_TEXT("Warning: an operation identified by ")
-              ACE_TEXT("\"%s\" has unresolved remote dependencies.\n"),
-              ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point)));
+              ACE_TEXT("\"%C\" has unresolved remote dependencies.\n"),
+              (const char*)task_entries_ [i].rt_info ()->entry_point));
 
           // Record entry point in list of unresolved remote dependencies
           ACE_OS::sprintf (string_buffer, "// %s\n",
@@ -1564,10 +1564,10 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
           // Local node that no one calls and has neither rate nor threads is suspect
           ACE_DEBUG (
              (LM_DEBUG,
-              ACE_TEXT("Error: operation \"%s\" does not specify a period or\n")
+              ACE_TEXT("Error: operation \"%C\" does not specify a period or\n")
               ACE_TEXT("visible threads, and is not called by any other operation.\n")
               ACE_TEXT("Are there backwards dependencies.\n"),
-              ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point)));
+              (const char*)task_entries_ [i].rt_info ()->entry_point));
 
           result = ST_UNRESOLVED_LOCAL_DEPENDENCIES;
 
@@ -1651,9 +1651,9 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry)
     {
       // indicate the two tasks are in (the same) dependency cycle
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()),
-                  ACE_TEXT_CHAR_TO_TCHAR(entry.rt_info ()->entry_point.in ())));
+                  ACE_TEXT("Tasks \"%C\" and \"%C\" are part of a call cycle.\n"),
+                  (*calling_entry_link)->caller ().rt_info ()->entry_point.in (),
+                  entry.rt_info ()->entry_point.in ()));
 
       // set return status, ignore status returned by recursive call:
       // we already know there are cycles in the dependencies
@@ -1936,8 +1936,8 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename)
   {
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ")
-                ACE_TEXT("Could not open schedule file (\"%s\")"),
-                ACE_TEXT_CHAR_TO_TCHAR(filename)));
+                ACE_TEXT("Could not open schedule file (\"%C\")"),
+                filename));
   }
 
   return status;
@@ -2158,8 +2158,8 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename)
   {
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ")
-                ACE_TEXT("Cannot open timeline file (\"%s\")\n"),
-                ACE_TEXT_CHAR_TO_TCHAR(filename)));
+                ACE_TEXT("Cannot open timeline file (\"%C\")\n"),
+                filename));
   }
 
   return status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 73ffd0a6666..f82c7d54ce7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -204,13 +204,12 @@ Receiver::init (int argc,
 
   // Open file to read.
   this->input_file_ =
-    ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+    ACE_OS::fopen (this->filename_.c_str (), "r");
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Cannot open input file %s\n",
-                       ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())),
+                       "Cannot open input file %C\n",
+                       this->filename_.c_str ()),
                       -1);
   else
     ACE_DEBUG ((LM_DEBUG,