diff options
24 files changed, 157 insertions, 172 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a9c3427ddc5..012e8734a39 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,32 @@ +Wed Jun 18 14:40:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp: + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp: + * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp: + * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp: + * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp: + * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + * orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp: + * orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp: + * orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp: + * orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp: + * orbsvcs/tests/AVStreams/Pluggable_Flows_Protocol/receiver.cpp: + * orbsvcs/tests/AVStreams/Pluggable_Flows_Protocol/sender.cpp: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp: + * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp: + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: + + Correct Fuzz errors concerning Wide character build compatabily + with ORB_init(). + Wed Jun 18 14:39:38 UTC 2008 Chad Elliott <elliott_c@ociweb.com> * tests/Bug_2494_Regression/client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index fefb7cd4a69..3b7127dcd43 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -54,8 +54,9 @@ TAO_LB_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr info) { int argc = 0; + ACE_TCHAR **argv= 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, - 0, + argv, this->orb_id_.in ()); // Save a copy of the current ObjectReferenceFactory. diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp index 1364fd46dd7..d765e1823db 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp @@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /// Constructor RTCosScheduling_ClientScheduler_i::RTCosScheduling_ClientScheduler_i ( CORBA::ORB_var orb, @@ -37,15 +36,15 @@ namespace TAO /// and put them into the activity_map_ if ( !ACE_OS::strcmp(file,"") || file == 0) { - ACE_DEBUG((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "No config supplied to the ServerScheduler, " "Server will not scheudle object execution " "(ServerScheduler interceptor not installed)")); } else if (!tasks(node_name, file, &activity_map_)) { - ACE_DEBUG((LM_DEBUG,"Invalid Filename given, aborting!\n")); - ACE_OS::exit(1); + ACE_DEBUG ((LM_DEBUG,"Invalid Filename given, aborting!\n")); + ACE_OS::exit (1); } // The tasks were successfully read in, create the client interceptor else @@ -53,9 +52,9 @@ namespace TAO #if (TAO_HAS_INTERCEPTORS == 1) ACE_NEW_THROW_EX (this->client_interceptor_, RTCosScheduling_ClientScheduler_Interceptor(orb), - CORBA::NO_MEMORY()); + CORBA::NO_MEMORY ()); - TAO_ORB_Core *orb_core = orb->orb_core(); + TAO_ORB_Core *orb_core = orb->orb_core (); // @@ (OO) Why isn't an ORBInitializer being used to // register the interceptor? In fact, all of the @@ -67,19 +66,19 @@ namespace TAO /// First, get a list of all interceptors currently registered TAO::ClientRequestInterceptor_List::TYPE &interceptors = - orb_core->client_request_interceptors(); + orb_core->client_request_interceptors (); /// Now check to see if the ServerScheduler Interceptor has already /// been registered u_int i; u_int unregistered = 1; - for (i = 0; i < interceptors.size() && unregistered; ++i) + for (i = 0; i < interceptors.size () && unregistered; ++i) { if (ACE_OS::strncmp(interceptors[i]->_interface_repository_id (), - this->client_interceptor_->_interface_repository_id(), - ACE_OS::strlen( - this->client_interceptor_->_interface_repository_id()-2)) + this->client_interceptor_->_interface_repository_id (), + ACE_OS::strlen ( + this->client_interceptor_->_interface_repository_id ()-2)) == 0) { /// The interceptor is already registered, @@ -92,13 +91,13 @@ namespace TAO /// another POA then register it now if (unregistered) { - orb_core->add_interceptor(this->client_interceptor_); + orb_core->add_interceptor (this->client_interceptor_); } #endif /* TAO_HAS_INTERCEPTORS == 1 */ /// Now resolve a reference to the Real Time ORB CORBA::Object_var rt_obj = - orb->resolve_initial_references("RTORB"); + orb->resolve_initial_references ("RTORB"); // Get a reference to the real time orb RTCORBA::RTORB_var rt_orb = @@ -113,24 +112,24 @@ namespace TAO /// Resolve a reference to the Linear Priority Mapping Manager rt_obj = - orb->resolve_initial_references("PriorityMappingManager"); + orb->resolve_initial_references ("PriorityMappingManager"); RTCORBA::PriorityMappingManager_var mapping_manager = - RTCORBA::PriorityMappingManager::_narrow(rt_obj.in()); + RTCORBA::PriorityMappingManager::_narrow (rt_obj.in ()); /// Create the Linear Priority Mapping Manager - ACE_NEW_THROW_EX(this->pm_, - TAO_Linear_Priority_Mapping( + ACE_NEW_THROW_EX (this->pm_, + TAO_Linear_Priority_Mapping ( ACE_SCHED_FIFO), - CORBA::NO_MEMORY()); + CORBA::NO_MEMORY ()); // WHERE the parameter is one of SCHED_OTHER, SCHED_FIFO, or SCHED_RR - mapping_manager->mapping(this->pm_); + mapping_manager->mapping (this->pm_); } } catch (const CORBA::Exception& ex) { - ACE_ERROR((LM_ERROR, "Could not configure the orb")); - ACE_OS::exit(1); + ACE_ERROR ((LM_ERROR, "Could not configure the orb")); + ACE_OS::exit (1); } } @@ -151,25 +150,24 @@ void RTCosScheduling_ClientScheduler_i::schedule_activity ( /// Look up the priority using the activity name in the activity map COS_SCHEDULER_ACTIVITY_VALUE priority = 0; CORBA::Short result = - this->activity_map_.find(activity_name, - priority); + this->activity_map_.find (activity_name, priority); /// If the activity/priority was found, set the current to the /// appropriate priority. if (result != -1) { - this->current_->the_priority(priority); + this->current_->the_priority (priority); } /// If the activity was not found, throw an UnknownName exception. else { - throw RTCosScheduling::UnknownName(); + throw RTCosScheduling::UnknownName (); } } int -RTCosScheduling_ClientScheduler_i::tasks( +RTCosScheduling_ClientScheduler_i::tasks ( const char *node_name, const char *file_name, CosSchedulerActivityMap *activity_map) @@ -177,65 +175,65 @@ RTCosScheduling_ClientScheduler_i::tasks( /// get the activity list just for the particular node const unsigned int BUF_MAX = 256; - FILE *fp = ACE_OS::fopen(file_name, "r"); + FILE *fp = ACE_OS::fopen (file_name, "r"); /// Make sure we can open the file if (fp == 0) { /// Error return of we cannot open the file. - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Could not find the config file %s, aborting\n", - file_name), + ACE_TEXT_CHAR_TO_TCHAR (file_name)), 0); } char line[BUF_MAX], key[64]; - ACE_OS::strsncpy(key, "Node ", sizeof(key)); - ACE_OS::strcat(key, node_name); + ACE_OS::strsncpy (key, "Node ", sizeof (key)); + ACE_OS::strcat (key, node_name); /// Skip to the appropriate node #ifndef ACE_LACKS_CLEARERR - ACE_OS::clearerr(fp); + ACE_OS::clearerr (fp); #else # warning ACE_OS::clearerr() is unimplemented on this platform. # warning This code may not function properly. #endif /* !ACE_LACKS_CLEARERR */ do { - ACE_OS::fgets(line, BUF_MAX, fp); + ACE_OS::fgets (line, BUF_MAX, fp); /// Make sure we did not hit the end of file - if (ACE_OS::last_error() == EOF) + if (ACE_OS::last_error () == EOF) { - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Node %s not found in config file\n", - node_name), + ACE_TEXT_CHAR_TO_TCHAR (node_name)), 0); break; } } - while (ACE_OS::strncmp(line, key, ACE_OS::strlen(key)) != 0); + while (ACE_OS::strncmp (line, key, ACE_OS::strlen (key)) != 0); /// Skip to the appropriate task section of the node #ifndef ACE_LACKS_CLEARERR - ACE_OS::clearerr(fp); + ACE_OS::clearerr (fp); #else # warning ACE_OS::clearerr() is unimplemented on this platform. # warning This code may not function properly. #endif /* !ACE_LACKS_CLEARERR */ do { - ACE_OS::fgets(line, BUF_MAX, fp); + ACE_OS::fgets (line, BUF_MAX, fp); /// Make sure we did not hit the end of file - if (ACE_OS::last_error() == EOF) + if (ACE_OS::last_error () == EOF) { ACE_ERROR_RETURN((LM_ERROR, "Task list not found for node %s\n", - node_name), + ACE_TEXT_CHAR_TO_TCHAR (node_name)), 0); break; } } - while (ACE_OS::strncmp(line, "Tasks:", ACE_OS::strlen("Tasks:")) != 0); + while (ACE_OS::strncmp (line, "Tasks:", ACE_OS::strlen ("Tasks:")) != 0); CORBA::Short done = 0; COS_SCHEDULER_ACTIVITY_KEY name; @@ -246,37 +244,37 @@ RTCosScheduling_ClientScheduler_i::tasks( while (!done) { /// get the activity name - ACE_OS::fgets(line, BUF_MAX, fp); + ACE_OS::fgets (line, BUF_MAX, fp); /// Make sure we did not hit the end of file - if (ACE_OS::last_error() == EOF) + if (ACE_OS::last_error () == EOF) { ACE_ERROR_RETURN((LM_ERROR, "Task list not found for node %s\n", - node_name), + ACE_TEXT_CHAR_TO_TCHAR (node_name)), 0); break; } /// check to make sure we have not reached the end of the list. - if (ACE_OS::strncmp(line, "END", ACE_OS::strlen("END")) != 0) + if (ACE_OS::strncmp (line, "END", ACE_OS::strlen ("END")) != 0) { - name = ACE_CString(line); - delimiter = name.find('\t'); - char *p = ACE_OS::strchr(line, '\t'); + name = ACE_CString (line); + delimiter = name.find ('\t'); + char *p = ACE_OS::strchr (line, '\t'); if (p) - priority = ACE_OS::atoi(p); + priority = ACE_OS::atoi (p); if (priority == 0) priority = RTCORBA::minPriority; - if (delimiter < name.length() && delimiter > 0) + if (delimiter < name.length () && delimiter > 0) { - activity_map->bind(name.substr(0, delimiter), priority); + activity_map->bind (name.substr (0, delimiter), priority); } else { - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Error in reading activities from %s", - file_name), + ACE_TEXT_CHAR_TO_TCHAR (file_name)), 0); } } @@ -292,20 +290,19 @@ RTCosScheduling_ClientScheduler_i::tasks( #if (TAO_HAS_INTERCEPTORS == 1) -RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor() : name_("RTCosScheduling_Client_Interceptor") +RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor () : name_ ("RTCosScheduling_Client_Interceptor") { try { /// resolve a reference to RT Current int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, - 0, - 0); + ACE_TCHAR **argv= 0; + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RTCurrent"); - if (CORBA::is_nil(obj.in())) + if (CORBA::is_nil (obj.in ())) { - ACE_OS::exit(1); + ACE_OS::exit (1); } else { @@ -314,18 +311,18 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int } obj = - orb->resolve_initial_references("CodecFactory"); + orb->resolve_initial_references ("CodecFactory"); IOP::CodecFactory_var codec_factory; - if (CORBA::is_nil(obj.in())) + if (CORBA::is_nil (obj.in ())) { - ACE_DEBUG((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Could not initialize client interceptor, aborting!\n")); - ACE_OS::exit(1); + ACE_OS::exit (1); } else { - codec_factory = IOP::CodecFactory::_narrow(obj.in()); + codec_factory = IOP::CodecFactory::_narrow (obj.in ()); } @@ -334,7 +331,7 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int encoding.major_version = 1; encoding.minor_version = 2; - this->codec_ = codec_factory->create_codec(encoding); + this->codec_ = codec_factory->create_codec (encoding); } catch (const CORBA::Exception& ex) { @@ -345,17 +342,17 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int } -RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor( - const CORBA::ORB_var orb) : name_("RTCosScheduling_Client_Interceptor") +RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Interceptor ( + const CORBA::ORB_var orb) : name_ ("RTCosScheduling_Client_Interceptor") { try { /// resolve a reference to RT Current CORBA::Object_var obj = orb->resolve_initial_references ("RTCurrent"); - if (CORBA::is_nil(obj.in())) + if (CORBA::is_nil (obj.in ())) { - ACE_OS::exit(1); + ACE_OS::exit (1); } else { @@ -364,16 +361,16 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int } obj = - orb->resolve_initial_references("CodecFactory"); + orb->resolve_initial_references ("CodecFactory"); // set up the codec factory to create the codec necessary to // encode the octet stream for the service context IOP::CodecFactory_var codec_factory; - if (CORBA::is_nil(obj.in())) + if (CORBA::is_nil (obj.in ())) { - ACE_DEBUG((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Could not initialize client interceptor, aborting!\n")); - ACE_OS::exit(1); + ACE_OS::exit (1); } else { @@ -387,7 +384,7 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int encoding.minor_version = 2; // Create the codec - this->codec_ = codec_factory->create_codec(encoding); + this->codec_ = codec_factory->create_codec (encoding); } catch (const CORBA::Exception& ex) { @@ -398,7 +395,7 @@ RTCosScheduling_ClientScheduler_Interceptor::RTCosScheduling_ClientScheduler_Int char * RTCosScheduling_ClientScheduler_Interceptor::name () { -return CORBA::string_dup(this->name_); +return CORBA::string_dup (this->name_); } void @@ -416,7 +413,7 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request ( // Get the Corba priority that the activity is currently running at CORBA::Any the_priority_as_any; the_priority_as_any <<= - this->current_->the_priority(); + this->current_->the_priority (); // Set up a service context to hold the priority IOP::ServiceContext sc; @@ -428,7 +425,7 @@ RTCosScheduling_ClientScheduler_Interceptor::send_request ( reinterpret_cast<CORBA::OctetSeq &> (*this->codec_->encode (the_priority_as_any)); // add the service context - ri->add_request_service_context(sc, 0); + ri->add_request_service_context (sc, 0); } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index c36f57f65ba..aa92b122cc3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -230,9 +230,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 18d495f3f30..00f565bbbbe 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -183,9 +183,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -217,7 +215,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - receiver.output_file_name ().c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (receiver.output_file_name ().c_str ())), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 6ca19cfa5da..139e3ec6155 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -123,7 +123,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -192,7 +192,7 @@ Sender::pace_data (void) { // At end of file break the loop and end the sender. if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n")); + ACE_DEBUG ((LM_DEBUG, "Handle_Start:End of file\n")); break; } @@ -285,9 +285,7 @@ main (int argc, { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index e9f0cf29f1c..8ac2e0da26b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -210,7 +210,7 @@ Receiver::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -268,9 +268,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -293,7 +291,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 25ccab3f767..693d70a3e54 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -170,7 +170,7 @@ Sender::bind_to_receiver (void) if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), + "Could not resolve Receiver_MMdevice in Naming service\n"), -1); return 0; @@ -208,7 +208,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -411,9 +411,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -450,7 +448,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index bd402aa6754..08d9d71856b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -110,7 +110,7 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo //if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Handle Conection Requested flowname %s \n", - entry.flowname ())); + ACE_TEXT_CHAR_TO_TCHAR (entry.flowname ()))); ACE_CString flowname (entry.flowname ()); @@ -419,9 +419,7 @@ main (int argc, { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 469bb69d7d2..84d7def4c7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -63,7 +63,7 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows ACE_DEBUG ((LM_DEBUG, "Handle Conection Requested flowname %s \n", - entry.flowname ())); + ACE_TEXT_CHAR_TO_TCHAR (entry.flowname ()))); ACE_CString flowname (entry.flowname ()); @@ -284,9 +284,7 @@ main (int argc, { /// Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -318,7 +316,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - receiver.output_file_name ().c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (receiver.output_file_name ().c_str ())), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index d6b8b855a50..511a7f71239 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -244,7 +244,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -441,9 +441,7 @@ main (int argc, { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 719b55dbc0c..a22adaea221 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -237,9 +237,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -270,7 +268,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index ebc628953b7..606bda9b9b3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -136,7 +136,7 @@ Sender::bind_to_receiver (void) if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), + "Could not resolve Receiver_MMdevice in Naming service\n"), -1); return 0; @@ -174,7 +174,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -359,9 +359,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index d0d61feb0f5..553b17ee8b6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -61,12 +61,12 @@ Receiver_Callback::flowname (const char* flow_name) if (this->output_file_ == 0) ACE_ERROR ((LM_DEBUG, "Cannot open output file %s\n", - this->flowname_.c_str ())); + ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ()))); else ACE_DEBUG ((LM_DEBUG, "%s File Opened Successfully\n", - this->flowname_.c_str ())); + ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ()))); } @@ -83,7 +83,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, ACE_DEBUG ((LM_DEBUG, "Receiver_Callback::receive_frame for frame %d for flow %s\n", this->frame_count_++, - this->flowname_.c_str ())); + ACE_TEXT_CHAR_TO_TCHAR (this->flowname_.c_str ()))); while (frame != 0) { @@ -232,9 +232,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 5ba3528f2f6..f51f29e9f96 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -115,7 +115,7 @@ Sender::bind_to_receiver (void) if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), + "Could not resolve Receiver_MMdevice in Naming service\n"), -1); return 0; @@ -153,7 +153,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -355,9 +355,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index de3a2ec9066..c1d4fd0f26e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -170,9 +170,7 @@ main (int argc, // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -203,7 +201,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 695c05cb6b3..0dc42d655a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -103,7 +103,7 @@ Sender::bind_to_receiver (void) if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), + "Could not resolve Receiver_MMdevice in Naming service\n"), -1); return 0; @@ -141,7 +141,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -335,9 +335,7 @@ main (int argc, ACE_High_Res_Timer::global_scale_factor (); CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 8410345517c..c6452e54b0e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -291,9 +291,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index c91db5e09c4..7cc97ddecf3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -165,9 +165,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -198,7 +196,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index c6a79820963..8d892465f89 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -141,7 +141,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -308,9 +308,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index acea9727275..52c6018c51b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -230,9 +230,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -263,7 +261,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index 740b549a1e6..3da289c970d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -157,7 +157,7 @@ Sender::bind_to_receiver (void) if (CORBA::is_nil (this->receiver_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Could not resolve Receiver_MMdevice in Naming service <%s>\n"), + "Could not resolve Receiver_MMdevice in Naming service\n"), -1); return 0; @@ -195,7 +195,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -423,9 +423,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 3e23a25cdb9..d2014491e15 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -168,9 +168,7 @@ main (int argc, { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); @@ -201,7 +199,7 @@ main (int argc, if (output_file == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file %s\n", - output_file_name), + ACE_TEXT_CHAR_TO_TCHAR (output_file_name)), -1); else diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index dde7cf28790..8cacb16ee50 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -239,7 +239,7 @@ Sender::init (int argc, if (this->input_file_ == 0) ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open input file %s\n", - this->filename_.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (this->filename_.c_str ())), -1); else ACE_DEBUG ((LM_DEBUG, @@ -485,9 +485,7 @@ main (int argc, try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_init (argc, argv); CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); |