diff options
111 files changed, 614 insertions, 481 deletions
diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp index d875fff1964..b43b1247c63 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -62,7 +62,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("ZZIPLIB support has not been") ACE_TEXT (" compiled in. Refer to ") ACE_TEXT ("$ACE_ROOT/ACEXML/README for more ") - ACE_TEXT ("information. \n"))); + ACE_TEXT ("information.\n"))); return -1; #else break; diff --git a/ACE/ASNMP/examples/get/get.cpp b/ACE/ASNMP/examples/get/get.cpp index 2b7b6b1ebd3..6cf1b0a7aab 100644 --- a/ACE/ASNMP/examples/get/get.cpp +++ b/ACE/ASNMP/examples/get/get.cpp @@ -142,8 +142,8 @@ void getapp::usage() { cout << "Usage:\n"; cout << "get [options] dotted-quad | DNSName[:port]\n"; - cout << " -o OID defaults to 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0) \n"; - cout << " -c Community_name, default is 'public' \n"; + cout << " -o OID defaults to 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0)\n"; + cout << " -c Community_name, default is 'public'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second" << endl; } diff --git a/ACE/ASNMP/examples/get/get_async.cpp b/ACE/ASNMP/examples/get/get_async.cpp index c3d82bfb609..008f7b18f66 100644 --- a/ACE/ASNMP/examples/get/get_async.cpp +++ b/ACE/ASNMP/examples/get/get_async.cpp @@ -142,8 +142,8 @@ void getapp::usage() { cout << "Usage:\n"; cout << "get [options] dotted-quad | DNSName[:port]\n"; - cout << " -o OID defaults to 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0) \n"; - cout << " -c Community_name, default is 'public' \n"; + cout << " -o OID defaults to 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0)\n"; + cout << " -c Community_name, default is 'public'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second" << endl; } diff --git a/ACE/ASNMP/examples/next/next.cpp b/ACE/ASNMP/examples/next/next.cpp index 50005cd4bc8..ed68a033d8f 100644 --- a/ACE/ASNMP/examples/next/next.cpp +++ b/ACE/ASNMP/examples/next/next.cpp @@ -141,8 +141,8 @@ void nextapp::usage() { cout << "Usage:\n"; cout << "next [options] dotted-quad | DNSName[:port]\n"; - cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0) \n"; - cout << " -c Community_name, default is 'public' \n"; + cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0)\n"; + cout << " -c Community_name, default is 'public'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second" << endl; } diff --git a/ACE/ASNMP/examples/set/set.cpp b/ACE/ASNMP/examples/set/set.cpp index baa6cfbf111..73302ab69c1 100644 --- a/ACE/ASNMP/examples/set/set.cpp +++ b/ACE/ASNMP/examples/set/set.cpp @@ -210,8 +210,8 @@ void set::usage() { cout << "Usage:\n"; cout << "next [options] dotted-quad | DNSName[:port]\n"; - cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0) \n"; - cout << " -c Community_name, default is 'private' \n"; + cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0)\n"; + cout << " -c Community_name, default is 'private'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second\n"; cout << " -O oid_to_set -{I,U,G,S,P} value\n"; diff --git a/ACE/ASNMP/examples/trap/trap.cpp b/ACE/ASNMP/examples/trap/trap.cpp index e394b2ee919..4be4021ca3e 100644 --- a/ACE/ASNMP/examples/trap/trap.cpp +++ b/ACE/ASNMP/examples/trap/trap.cpp @@ -145,7 +145,7 @@ void trapapp::usage() { cout << "Usage:\n"; cout << "trap [options] dotted-quad | DNSName[:port]\n"; - cout << " -c Community_name, default is 'public' \n"; + cout << " -c Community_name, default is 'public'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second" << endl; cout << " -e oid enterprise oid default is 1.3.6.1.2.1.1.1.2.0.1\n"; diff --git a/ACE/ASNMP/examples/walk/walk.cpp b/ACE/ASNMP/examples/walk/walk.cpp index 3ff29e9bd86..dabd3a5437a 100644 --- a/ACE/ASNMP/examples/walk/walk.cpp +++ b/ACE/ASNMP/examples/walk/walk.cpp @@ -141,8 +141,8 @@ void walkapp::usage() { cout << "Usage:\n"; cout << "walk [options] dotted-quad | DNSName[:port]\n"; - cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0) \n"; - cout << " -c Community_name, default is 'public' \n"; + cout << " -o OID starts with oid after 1.3.6.1.2.1.1.1.0 (mibII sysDescr.0)\n"; + cout << " -c Community_name, default is 'public'\n"; cout << " -r N retries default is N = 1 retry\n"; cout << " -t N timeout in seconds default is 1 second" << endl; } diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 026b73b000a..c46ef94fc2e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,123 @@ +Mon Feb 23 08:16:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/global.features + Layout changes + + * bin/PerlACE/ProcessVX_Unix.pm + Improved quote handling + + * debianbuild/dsc: + New file + + * ace/Activation_Queue.cpp + * ace/ATM_Addr.cpp + * ace/ATM_Connector.inl + * ace/Configuration_Import_Export.cpp + * ace/Dynamic_Message_Strategy.cpp + * ace/Future.cpp + * ace/Message_Queue_T.cpp + * ace/Naming_Context.cpp + * ace/POSIX_Asynch_IO.cpp + * ace/QoS/QoS_Session_Impl.cpp + * ace/Timer_Heap_T.cpp + * ace/Timer_Wheel_T.cpp + * ace/TP_Reactor.cpp + * ace/WIN32_Asynch_IO.cpp + * ACEXML/examples/SAXPrint/main.cpp + * apps/gperf/src/Options.cpp + * apps/JAWS/server/HTTP_Handler.cpp + * apps/mkcsregdb/mkcsregdb.cpp + * ASNMP/examples/get/get.cpp + * ASNMP/examples/get/get_async.cpp + * ASNMP/examples/next/next.cpp + * ASNMP/examples/set/set.cpp + * ASNMP/examples/trap/trap.cpp + * ASNMP/examples/walk/walk.cpp + * examples/APG/Containers/DLList.cpp + * examples/APG/Containers/Hash_Map.cpp + * examples/APG/Containers/Hash_Map_Hash.cpp + * examples/APG/Containers/Map_Manager.cpp + * examples/APG/Containers/Map_Manager_Specialization.cpp + * examples/APG/Containers/RB_Tree.cpp + * examples/APG/Containers/RB_Tree_Functors.cpp + * examples/APG/ThreadManagement/Coop_Cancel.cpp + * examples/APG/ThreadManagement/ExitHandler.cpp + * examples/APG/ThreadManagement/Pool.cpp + * examples/APG/ThreadManagement/Signals2.cpp + * examples/APG/ThreadManagement/Start_Hook.cpp + * examples/APG/ThreadSafety/Atomic_Op.cpp + * examples/APG/ThreadSafety/TSS.cpp + * examples/APG/Timers/Task.cpp + * examples/ASX/Event_Server/Event_Server/Options.cpp + * examples/ASX/Event_Server/Event_Server/Peer_Router.cpp + * examples/ASX/Event_Server/Transceiver/transceiver.cpp + * examples/ASX/UPIPE_Event_Server/Options.cpp + * examples/ASX/UPIPE_Event_Server/Peer_Router.cpp + * examples/Connection/misc/Connection_Handler.cpp + * examples/IPC_SAP/ATM_SAP/CPP-client.cpp + * examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp + * examples/IPC_SAP/SSL_SAP/SSL-server.cpp + * examples/QOS/Change_Receiver_FlowSpec/receiver.cpp + * examples/QOS/Change_Receiver_FlowSpec/sender.cpp + * examples/QOS/Change_Sender_TSpec/receiver.cpp + * examples/QOS/Change_Sender_TSpec/sender.cpp + * examples/QOS/Simple/receiver.cpp + * examples/QOS/Simple/sender.cpp + * examples/Reactor/Proactor/post_completions.cpp + * examples/Reactor/Proactor/test_aiosig.cpp + * examples/Reactor/Proactor/test_aiosig_ace.cpp + * examples/Reactor/Proactor/test_end_event_loop.cpp + * examples/Threads/auto_event.cpp + * examples/Threads/manual_event.cpp + * examples/Timer_Queue/Async_Timer_Queue_Test.cpp + * Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp + * Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp + * Kokyu/tests/DSRT_MIF/MIF.cpp + * netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp + * netsvcs/lib/Name_Handler.cpp + * NEWS + * performance-tests/SCTP/Options_Manager.cpp + * performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp + * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp + * performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp + * performance-tests/TCP/tcp_test.cpp + * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp + * performance-tests/UDP/udp_test.cpp + * protocols/tests/HTBP/Reactor_Tests/server.cpp + * protocols/tests/HTBP/Send_Large_Msg/server.cpp + * protocols/tests/HTBP/Send_Recv_Tests/client.cpp + * protocols/tests/HTBP/Send_Recv_Tests/server.cpp + * tests/Cache_Map_Manager_Test.cpp + * tests/CDR_Array_Test.cpp + * tests/CDR_Test.cpp + * tests/DLList_Test.cpp + * tests/Get_Opt_Test.cpp + * tests/Hash_Map_Manager_Test.cpp + * tests/Hash_Multi_Map_Manager_Test.cpp + * tests/IOStream_Test.cpp + * tests/Logging_Strategy_Test.cpp + * tests/Max_Default_Port_Test.cpp + * tests/Max_Default_Port_Test_IPV6.cpp + * tests/Message_Queue_Notifications_Test.cpp + * tests/MT_Reference_Counted_Event_Handler_Test.cpp + * tests/Multicast_Test.cpp + * tests/Multicast_Test_IPV6.cpp + * tests/Naming_Test.cpp + * tests/Network_Adapters_Test.cpp + * tests/Pipe_Test.cpp + * tests/QtReactor_Test.cpp + * tests/Reactor_Notification_Queue_Test.cpp + * tests/Reactor_Remove_Resume_Test.cpp + * tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp + * tests/Reactors_Test.cpp + * tests/Signal_Test.cpp + * tests/SOCK_Netlink_Test.cpp + * tests/SOCK_SEQPACK_SCTP_Test.cpp + * tests/SString_Test.cpp + * tests/Thread_Pool_Reactor_Resume_Test.cpp + * tests/Upgradable_RW_Test.cpp + Zapped empty spaces at the end of a line + Fri Feb 20 13:50:33 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-win32-mingw.h: diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp index a5d28115fac..d9a2eebab59 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp @@ -13,7 +13,7 @@ ACE_RCSID(Kokyu, DSRT_CV_Dispatcher_Impl_T, "$Id$") namespace Kokyu { - + /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h @@ -41,7 +41,7 @@ operator ()(const DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits>& item1, template <class DSRT_Scheduler_Traits> DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>:: -DSRT_CV_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, +DSRT_CV_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, int sched_scope) :DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits> (sched_policy, sched_scope), run_cond_ (run_cond_lock_) @@ -61,16 +61,16 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i enter\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i enter\n")); #endif DSRT_Dispatch_Item<DSRT_Scheduler_Traits>* item; ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); - if (ACE_OS::thr_setprio (thr_handle, - this->blocked_prio_, + if (ACE_OS::thr_setprio (thr_handle, + this->blocked_prio_, this->sched_policy_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -90,10 +90,10 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) #ifdef KOKYU_DSRT_LOGGING this->ready_queue_.dump (); - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i after ready_q.insert\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i after ready_q.insert\n")); #endif - + DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits> item_var; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, cond_guard, run_cond_lock_, -1); @@ -104,25 +104,25 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) ACE_hthread_t most_eligible_thr_handle = item_var->thread_handle (); #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):curr thr handle = %d\n", - thr_handle)); - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):curr scheduled thr handle = %d\n", - this->curr_scheduled_thr_handle_)); - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):most eligible thr handle = %d \n", - most_eligible_thr_handle)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):curr thr handle = %d\n", + thr_handle)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):curr scheduled thr handle = %d\n", + this->curr_scheduled_thr_handle_)); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):most eligible thr handle = %d\n", + most_eligible_thr_handle)); #endif if (this->curr_scheduled_thr_handle_ == thr_handle && most_eligible_thr_handle != thr_handle) { #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T):curr sched thr handle = thr_handle & " "most eligible thr handle != curr thr handle. " - "about to do a broadcast on CV to wake up most eligible\n")); + "about to do a broadcast on CV to wake up most eligible\n")); #endif this->curr_scheduled_thr_handle_ = most_eligible_thr_handle; //wake up the most eligible thread @@ -133,20 +133,20 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) //if the current thread is most eligible, but some thread is //scheduled currently, then wait. while (most_eligible_thr_handle != thr_handle || - (most_eligible_thr_handle == thr_handle && + (most_eligible_thr_handle == thr_handle && this->curr_scheduled_thr_handle_ != thr_handle && this->curr_scheduled_thr_handle_ != 0)) { ACE_Time_Value tv (60,0); tv += ACE_OS::gettimeofday (); - //wait a maximum of 1 min. This is an escape latch against lockups. + //wait a maximum of 1 min. This is an escape latch against lockups. #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T): About to block on cv\n")); #endif - if (this->run_cond_.wait (&tv) == -1) + if (this->run_cond_.wait (&tv) == -1) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "(%t|%T): run_cond.wait timed out -- Possible Lockup\n")); } this->ready_queue_.most_eligible (item_var); @@ -156,23 +156,23 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) this->curr_scheduled_thr_handle_ = most_eligible_thr_handle; #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "(%t|%T): %d is currently running\n", thr_handle)); #endif - if (ACE_OS::thr_setprio (thr_handle, - this->active_prio_, + if (ACE_OS::thr_setprio (thr_handle, + this->active_prio_, this->sched_policy_) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("thr_setprio failed"))); } - + #ifdef KOKYU_DSRT_LOGGING - ACE_DEBUG ((LM_DEBUG, - "(%t|%T):schedule_i exit\n")); + ACE_DEBUG ((LM_DEBUG, + "(%t|%T):schedule_i exit\n")); #endif return 0; @@ -181,7 +181,7 @@ schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) template <class DSRT_Scheduler_Traits> int DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>:: update_schedule_i (Guid_t guid, const DSRT_QoSDescriptor& qos) -{ +{ return this->schedule_i (guid, qos); } @@ -205,8 +205,8 @@ update_schedule_i (Guid_t guid, Block_Flag_t flag) if (found == 0) ACE_DEBUG ((LM_DEBUG, "(%t|%T): %d found in ready queue\n", thr_handle)); else - ACE_DEBUG ((LM_DEBUG, "(%t|%T): %d not found in ready queue\n", - thr_handle)); + ACE_DEBUG ((LM_DEBUG, "(%t|%T): %d not found in ready queue\n", + thr_handle)); #endif if (found == 0 && flag == BLOCK) @@ -217,8 +217,8 @@ update_schedule_i (Guid_t guid, Block_Flag_t flag) ACE_DEBUG ((LM_DEBUG, "(%t|%T): update schedule: %d found\n", thr_handle)); #endif - if (ACE_OS::thr_setprio (thr_handle, - this->blocked_prio_, + if (ACE_OS::thr_setprio (thr_handle, + this->blocked_prio_, this->sched_policy_) == -1) { ACE_ERROR ((LM_ERROR, diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index ebbea987c50..5339fe8a3b8 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -149,7 +149,7 @@ DSRT_Direct_Dispatcher_Impl<DSRT_Scheduler_Traits>::svc (void) "(%t|%T):curr scheduled thr handle = %d\n", this->curr_scheduled_thr_handle_)); ACE_DEBUG ((LM_DEBUG, - "(%t|%T):most eligible thr handle = %d \n", + "(%t|%T):most eligible thr handle = %d\n", most_eligible_thr_handle)); #endif diff --git a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp index 4c943533ad6..e5fd6f5cdff 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -108,7 +108,7 @@ int MyTask::svc (void) seconds_tracker.set (0,0); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Currently running guid=%d") - ACE_TEXT (", qos_.importance=%d \n"), + ACE_TEXT (", qos_.importance=%d\n"), guid_, qos_.importance_)); } timer.reset (); @@ -6,6 +6,8 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known) USER VISIBLE CHANGES BETWEEN ACE-5.6.8 and ACE-5.6.9 ==================================================== +. Removed Borland/CodeGear C++ Builder 2007 support + USER VISIBLE CHANGES BETWEEN ACE-5.6.7 and ACE-5.6.8 ==================================================== @@ -23,7 +25,7 @@ USER VISIBLE CHANGES BETWEEN ACE-5.6.7 and ACE-5.6.8 . Fixed log output formatting on some platforms. -. Bugs fixed: 2748, 3164, 3480, 3494, 3502, 3541, 3542, 3544, 3557. +. Bugs fixed: 2748, 3164, 3480, 3494, 3502, 3541, 3542, 3544, 3557. USER VISIBLE CHANGES BETWEEN ACE-5.6.6 and ACE-5.6.7 ==================================================== diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp index 19088cef5b1..58f1e95263d 100644 --- a/ACE/ace/ATM_Addr.cpp +++ b/ACE/ace/ATM_Addr.cpp @@ -338,7 +338,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[]) } if (WSALookupServiceEnd (hLookup) == SOCKET_ERROR) { - ACE_OS::printf ("Error : WSALookupServiceEnd failed! %d \n", + ACE_OS::printf ("Error : WSALookupServiceEnd failed! %d\n", ::WSAGetLastError ()); errno = EINVAL; return -1; diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl index ef0773b8930..dcf4b80284a 100644 --- a/ACE/ace/ATM_Connector.inl +++ b/ACE/ace/ATM_Connector.inl @@ -96,7 +96,7 @@ ACE_ATM_Connector::add_leaf (ACE_ATM_Stream ¤t_stream, return (result != ACE_INVALID_HANDLE); #elif defined (ACE_HAS_LINUX_ATM) - ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux \n"); + ACE_OS::printf("ATM_Connector(add_leaf): not yet implemented in Linux\n"); ACE_UNUSED_ARG(current_stream); ACE_UNUSED_ARG(remote_sap); diff --git a/ACE/ace/Activation_Queue.cpp b/ACE/ace/Activation_Queue.cpp index aef17d05e7a..324a26bcce3 100644 --- a/ACE/ace/Activation_Queue.cpp +++ b/ACE/ace/Activation_Queue.cpp @@ -23,7 +23,7 @@ ACE_Activation_Queue::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_queue_ = %d\n"), this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_: \n"))); + ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n"))); if (this->queue_) this->queue_->dump(); else diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index ce4cbac84c1..fe26cc9bbe9 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -254,7 +254,7 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio ACE_TString header = ACE_TEXT ("["); header += path; header += ACE_TEXT ("]"); - header += ACE_TEXT (" \n"); + header += ACE_TEXT ("\n"); if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; // Write out each value diff --git a/ACE/ace/Dynamic_Message_Strategy.cpp b/ACE/ace/Dynamic_Message_Strategy.cpp index 060aef6f5b5..201052c2acd 100644 --- a/ACE/ace/Dynamic_Message_Strategy.cpp +++ b/ACE/ace/Dynamic_Message_Strategy.cpp @@ -149,7 +149,7 @@ ACE_Deadline_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); @@ -192,7 +192,7 @@ ACE_Laxity_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index 97358b7f834..9945827c09c 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -54,7 +54,7 @@ ACE_Future_Rep<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, "ref_count_ = %d\n", (int) this->ref_count_)); - ACE_DEBUG ((LM_INFO,"value_: \n")); + ACE_DEBUG ((LM_INFO,"value_:\n")); if (this->value_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n"))); else @@ -62,9 +62,9 @@ ACE_Future_Rep<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); //FUZZ: enable check_for_NULL - ACE_DEBUG ((LM_INFO,"value_ready_: \n")); + ACE_DEBUG ((LM_INFO,"value_ready_:\n")); this->value_ready_.dump (); - ACE_DEBUG ((LM_INFO,"value_ready_mutex_: \n")); + ACE_DEBUG ((LM_INFO,"value_ready_mutex_:\n")); this->value_ready_mutex_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index fc2874130c1..bd07c300c97 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -981,9 +981,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); not_empty_cond_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -1028,12 +1028,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm, char pid_buf[sizeof (int) + 1]; ACE_OS::sprintf (pid_buf, "%d", ACE_OS::getpid ()); pid_buf[sizeof (int)] = '\0'; - + const int addr_nibbles = 2 * sizeof (ptrdiff_t); char addr_buf[addr_nibbles + 1]; ACE_OS::sprintf (addr_buf, "%p", this); addr_buf[addr_nibbles] = '\0'; - + ACE_CString name_str ("Message_Queue_"); name_str += pid_buf; name_str += '_'; @@ -2212,7 +2212,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class): \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class):\n"))); this->ACE_Message_Queue<ACE_SYNCH_USE>::dump (); ACE_DEBUG ((LM_DEBUG, @@ -2229,7 +2229,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ : \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); message_strategy_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -2255,7 +2255,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item // Refresh priority status boundaries in the queue. result = this->refresh_queue (current_time); - + if (result < 0) { return result; diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index 0d2c09ee9a3..334f5e1b368 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -624,8 +624,8 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-p nameserver port]\n" "\t[-s database name]\n" "\t[-b base address]\n" - "\t[-v] (verbose) \n" - "\t[-r] (use Win32 Registry) \n", + "\t[-v] (verbose)\n" + "\t[-r] (use Win32 Registry)\n", argv[0]); /* NOTREACHED */ break; diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp index 363a58b80c3..5d354093d69 100644 --- a/ACE/ace/POSIX_Asynch_IO.cpp +++ b/ACE/ace/POSIX_Asynch_IO.cpp @@ -815,7 +815,7 @@ ACE_POSIX_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:") - ACE_TEXT("acceptor already open \n")), + ACE_TEXT("acceptor already open\n")), -1); if (-1 == ACE_POSIX_Asynch_Operation::open (handler_proxy, diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index e46b6e4422b..d7bd3f2523a 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -346,7 +346,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) -1); else ACE_DEBUG ((LM_DEBUG, - "rapi_sender () call succeeds with PATH Tear! \n")); + "rapi_sender () call succeeds with PATH Tear!\n")); return 0; } @@ -421,7 +421,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) -1); else ACE_DEBUG ((LM_DEBUG, - "rapi_sender () call succeeds ! \n")); + "rapi_sender () call succeeds !\n")); return 0; } @@ -456,7 +456,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) -1); else ACE_DEBUG ((LM_DEBUG, - "rapi_reserve () for RESV Tear call succeeds \n")); + "rapi_reserve () for RESV Tear call succeeds\n")); return 0; } @@ -524,7 +524,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) -1); else ACE_DEBUG ((LM_DEBUG, - "rapi_reserve () call succeeds \n")); + "rapi_reserve () call succeeds\n")); return 0; } @@ -689,7 +689,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, -1); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds \n"))); + ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds\n"))); return 0; } diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index f0df1119550..ea1988a4d42 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -657,7 +657,7 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE, { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_TP_Reactor::notify_handle: ") - ACE_TEXT ("Wrong version of notify_handle() got called \n"))); + ACE_TEXT ("Wrong version of notify_handle() got called\n"))); ACE_ASSERT (eh == 0); ACE_UNUSED_ARG (eh); diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index b31aed4b46a..ab770b27e4c 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -349,7 +349,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"), this->timer_ids_min_free_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n"))); for (size_t i = 0; i < this->cur_size_; ++i) { @@ -359,7 +359,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const this->heap_[i]->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n"))); for (size_t j = 0; j < this->max_size_; ++j) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 2855de8a8a7..b860c1604dd 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -699,7 +699,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\nwheel_ = \n"))); + ACE_TEXT ("\nwheel_ =\n"))); for (u_int i = 0; i < this->spoke_count_; ++i) { diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index b5249884524..21ccc7a85cd 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -2385,7 +2385,7 @@ ACE_WIN32_Asynch_Connect::open (const ACE_Handler::Proxy_Ptr &handler_proxy, if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") - ACE_TEXT ("connector already open \n")), + ACE_TEXT ("connector already open\n")), -1); //int result = diff --git a/ACE/apps/JAWS/server/HTTP_Handler.cpp b/ACE/apps/JAWS/server/HTTP_Handler.cpp index 340d4773c3f..b87fda02b5c 100644 --- a/ACE/apps/JAWS/server/HTTP_Handler.cpp +++ b/ACE/apps/JAWS/server/HTTP_Handler.cpp @@ -34,7 +34,7 @@ void HTTP_Handler::open (ACE_HANDLE handle, ACE_Message_Block &initial_data) { - ACE_DEBUG ((LM_DEBUG, "(%t) New connection \n")); + ACE_DEBUG ((LM_DEBUG, "(%t) New connection\n")); int sockbufsize = HTTP_Handler::MAX_SOCKBUFSIZE; int result = ACE_OS::setsockopt (handle, diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp index be5f8c356c3..4e1ff23da1f 100644 --- a/ACE/apps/gperf/src/Options.cpp +++ b/ACE/apps/gperf/src/Options.cpp @@ -243,7 +243,7 @@ Options::~Options (void) "all characters are used in the hash function\n"); ACE_OS::fprintf (stderr, - "maximum keysig size = %d\nkey positions are: \n", + "maximum keysig size = %d\nkey positions are:\n", total_keysig_size_); for (ptr = key_positions_; *ptr != EOS; ptr++) @@ -440,7 +440,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) "\tof 2 generates 2 tables with 1/2 the elements in each table, etc.\n" "\tThis is useful since many C compilers cannot correctly generate code\n" "\tfor large switch statements.\n" - "-t\tAllows the user to include a structured type declaration for \n" + "-t\tAllows the user to include a structured type declaration for\n" "\tgenerated code. Any text before %%%% is consider part of the type\n" "\tdeclaration. Key words and additional fields may follow this, one\n" "\tgroup of fields per line.\n" diff --git a/ACE/apps/mkcsregdb/mkcsregdb.cpp b/ACE/apps/mkcsregdb/mkcsregdb.cpp index 2dc87b85bce..bdb112c14b8 100644 --- a/ACE/apps/mkcsregdb/mkcsregdb.cpp +++ b/ACE/apps/mkcsregdb/mkcsregdb.cpp @@ -236,7 +236,7 @@ csdb_generator::init_output (const char *srcfile) ACE_OS::fprintf (outf_,"/*\n * Codeset registry DB, generated %s * source: %s\n", ACE_OS::asctime (ACE_OS::localtime(&now)), srcfile); - ACE_OS::fprintf (outf_," *\n * To populate the registry_db, construct a codeset registry text file based \n"); + ACE_OS::fprintf (outf_," *\n * To populate the registry_db, construct a codeset registry text file based\n"); ACE_OS::fprintf (outf_," * on the OSF's Character and Code Set Registry. See DCE RFC 40.1 for details\n"); ACE_OS::fprintf (outf_," * on obtaining the full text for the current registry. Once you have composed\n"); ACE_OS::fprintf (outf_," * a text file containing all the desired codeset information, build and run\n"); diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 712f1c8ad6d..95464b66506 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -52,10 +52,10 @@ stl = 0 xsc = 0 mcpp = 0 tao_idl_fe_gen = 0 -xerces = 0 -xerces2 = 0 -xerces3 = 0 -ofccm = 0 +xerces = 0 +xerces2 = 0 +xerces3 = 0 +ofccm = 0 // Features for various GUI libraries // Some of features are switched on because they are also controlled diff --git a/ACE/bin/PerlACE/ProcessVX_Unix.pm b/ACE/bin/PerlACE/ProcessVX_Unix.pm index 91764ffa3d0..23e076bade3 100644 --- a/ACE/bin/PerlACE/ProcessVX_Unix.pm +++ b/ACE/bin/PerlACE/ProcessVX_Unix.pm @@ -215,6 +215,7 @@ sub Spawn () $cmdline = $program . $PerlACE::ProcessVX::ExeExt . ' ' . $self->{ARGUMENTS}; if (defined $self->{ARGUMENTS}) { ($arguments = $self->{ARGUMENTS})=~ s/\"/\\\"/g; + ($arguments = $self->{ARGUMENTS})=~ s/\'/\\\'/g; $arguments = ",\"" . $arguments . "\""; } if (defined $ENV{'ACE_RUN_VX_TGTSRV_WORKINGDIR'}) { diff --git a/ACE/debianbuild/dsc b/ACE/debianbuild/dsc new file mode 100644 index 00000000000..0eb4b47c54f --- /dev/null +++ b/ACE/debianbuild/dsc @@ -0,0 +1,10 @@ +# Format: 1.0 +# Source: ace +# Version: 1.5.7 +# Binary: ace +# Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> +# Architecture: any +# Build-Depends: g++ +# Files: +# d57283ebb8157ae919762c58419353c8 133282 ACE+TAO+CIAO-src-5.6.7.tar.bz2 +# diff --git a/ACE/examples/APG/Containers/DLList.cpp b/ACE/examples/APG/Containers/DLList.cpp index 8c93e5b4039..d45d5c5fb38 100644 --- a/ACE/examples/APG/Containers/DLList.cpp +++ b/ACE/examples/APG/Containers/DLList.cpp @@ -97,7 +97,7 @@ ListTest::displayList (MyList& list) } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration\n"))); ACE_DLList_Reverse_Iterator<DataElement> riter (list); while (!riter.done ()) { diff --git a/ACE/examples/APG/Containers/Hash_Map.cpp b/ACE/examples/APG/Containers/Hash_Map.cpp index 1b2d4ee4634..d93d9d54be5 100644 --- a/ACE/examples/APG/Containers/Hash_Map.cpp +++ b/ACE/examples/APG/Containers/Hash_Map.cpp @@ -54,7 +54,7 @@ int Hash_Map_Example::run (void) map_.bind (i, DataElement(i)); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has\n"))); for (int j = 0; j < 100; j++) { DataElement d; @@ -82,7 +82,7 @@ void Hash_Map_Example::iterate_forward (void) { ACE_TRACE (ACE_TEXT ("Hash_Map_Example::iterate_forward")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration\n"))); for (Hash_Map<int, DataElement>::iterator iter = map_.begin (); iter != map_.end (); iter++) { @@ -95,7 +95,7 @@ void Hash_Map_Example::iterate_reverse (void) { ACE_TRACE (ACE_TEXT ("Hash_Map_Example::iterate_reverse")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration\n"))); for (Hash_Map<int, DataElement>::reverse_iterator iter = map_.rbegin (); iter != map_.rend (); iter++) { diff --git a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp index faad3c72585..f81136ac085 100644 --- a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp +++ b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp @@ -47,7 +47,7 @@ int Hash_Map_Example::run (void) map_.bind (i, DataElement (i)); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has\n"))); for (int j = 0; j < 100; j++) { DataElement d; @@ -75,7 +75,7 @@ void Hash_Map_Example::iterate_forward (void) { ACE_TRACE (ACE_TEXT ("Hash_Map_Example::iterate_forward")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration\n"))); for (Hash_Map<KeyType, DataElement>::iterator iter = map_.begin (); iter != map_.end (); iter++) { @@ -88,7 +88,7 @@ void Hash_Map_Example::iterate_reverse (void) { ACE_TRACE (ACE_TEXT ("Hash_Map_Example::iterate_reverse")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration\n"))); for (Hash_Map<KeyType, DataElement>::reverse_iterator iter = map_.rbegin (); iter != map_.rend (); iter++) { diff --git a/ACE/examples/APG/Containers/Map_Manager.cpp b/ACE/examples/APG/Containers/Map_Manager.cpp index 6673204fcc4..8588a52daf2 100644 --- a/ACE/examples/APG/Containers/Map_Manager.cpp +++ b/ACE/examples/APG/Containers/Map_Manager.cpp @@ -37,7 +37,7 @@ int Map_Example::run (void) map_.bind (i, DataElement (i)); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has\n"))); for (int j = 0; j < 100; j++) { DataElement d; diff --git a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp index 2943967d3af..afffce23b5d 100644 --- a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp +++ b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp @@ -77,7 +77,7 @@ int Map_Example::run (void) map_.bind (i, DataElement (i)); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Map has\n"))); for (int j = 0; j < 100; j++) { DataElement d; diff --git a/ACE/examples/APG/Containers/RB_Tree.cpp b/ACE/examples/APG/Containers/RB_Tree.cpp index 187332a31d8..cf6c2326df4 100644 --- a/ACE/examples/APG/Containers/RB_Tree.cpp +++ b/ACE/examples/APG/Containers/RB_Tree.cpp @@ -50,7 +50,7 @@ int Tree_Example::run (void) } } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using find: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using find:\n"))); for (int j = 0; j < 100; j++) { tree_.find (j, d); @@ -77,7 +77,7 @@ void Tree_Example::iterate_forward (void) { ACE_TRACE (ACE_TEXT ("Tree_Example::iterate_forward")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration:\n"))); for (Tree<int, DataElement*>::iterator iter = tree_.begin (); iter != tree_.end (); iter++) { @@ -91,7 +91,7 @@ void Tree_Example::iterate_reverse (void) { ACE_TRACE (ACE_TEXT ("Tree_Example::iterate_reverse")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration:\n"))); for (Tree<int, DataElement*>::reverse_iterator iter = tree_.rbegin (); iter != tree_.rend (); iter++) diff --git a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp index cb71fd75d79..3010075761d 100644 --- a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp +++ b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp @@ -52,7 +52,7 @@ int Tree_Example::run () } } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using find: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using find:\n"))); for (int j = 0; j < 100; j++) { DataElement* d = 0; @@ -84,7 +84,7 @@ void Tree_Example::iterate_forward (void) { ACE_TRACE (ACE_TEXT ("Tree_Example::iterate_forward")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forward Iteration\n"))); for (Tree<KeyType, DataElement*>::iterator iter = tree_.begin (); iter != tree_.end (); iter++) { @@ -97,7 +97,7 @@ void Tree_Example::iterate_reverse (void) { ACE_TRACE (ACE_TEXT ("Tree_Example::iterate_reverse")); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse Iteration\n"))); for (Tree<KeyType, DataElement*>::reverse_iterator iter = tree_.rbegin (); iter != tree_.rend (); iter++) { diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp index 4a7714cf14b..781f72e4d35 100644 --- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp @@ -15,7 +15,7 @@ public: virtual int svc (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); // Cache our ACE_Thread_Manager pointer. ACE_Thread_Manager *mgr = this->thr_mgr (); diff --git a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp index 85238eac052..0d47b430f51 100644 --- a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp +++ b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp @@ -9,7 +9,7 @@ class ExitHandler : public ACE_At_Thread_Exit public: virtual void apply (void) { - ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting \n"))); + ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting\n"))); // Shut down all devices. } @@ -24,7 +24,7 @@ public: virtual int svc (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); this->thr_mgr ()->at_exit (eh_); diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp index 30ae56801a5..bc3644480a6 100644 --- a/ACE/examples/APG/ThreadManagement/Pool.cpp +++ b/ACE/examples/APG/ThreadManagement/Pool.cpp @@ -12,7 +12,7 @@ class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH> public: virtual int svc (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); ACE_Message_Block *mb; if (this->getq (mb) == -1) return -1; diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp index 0df855c45bb..bb9497cb6c6 100644 --- a/ACE/examples/APG/ThreadManagement/Signals2.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp @@ -68,7 +68,7 @@ SignalableTask::handle_alert (void) // Listing 1 code/ch13 int ACE_TMAIN (int, ACE_TCHAR *[]) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Main thread \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Main thread\n"))); SignalableTask handler; handler.activate (THR_NEW_LWP | THR_JOINABLE, 5); diff --git a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp index 1c4ad0794b7..e48a29f6861 100644 --- a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp +++ b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp @@ -38,7 +38,7 @@ class HA_CommandHandler : public ACE_Task_Base public: virtual int svc (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); // Do something. diff --git a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp index d315d433a66..29199fffaa9 100644 --- a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp +++ b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp @@ -42,7 +42,7 @@ public: buf_[in_.value () % Q_SIZE] = itemNo.value (); in_++; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Produced %d \n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Produced %d\n"), itemNo.value ())); if (check_termination (itemNo.value ())) diff --git a/ACE/examples/APG/ThreadSafety/TSS.cpp b/ACE/examples/APG/ThreadSafety/TSS.cpp index 8cc875cb3ee..f0b3c59ee9f 100644 --- a/ACE/examples/APG/ThreadSafety/TSS.cpp +++ b/ACE/examples/APG/ThreadSafety/TSS.cpp @@ -42,7 +42,7 @@ public: { ACE_thread_t *tid = (ACE_thread_t*)this->tss_ctx_->get_attribute ("thread_id"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) TSS TID: %d \n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) TSS TID: %d\n"), *tid)); // do work. diff --git a/ACE/examples/APG/Timers/Task.cpp b/ACE/examples/APG/Timers/Task.cpp index 4774eb1444f..c5ab6b4591c 100644 --- a/ACE/examples/APG/Timers/Task.cpp +++ b/ACE/examples/APG/Timers/Task.cpp @@ -40,7 +40,7 @@ private: int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("the main thread %t has started \n"))); + ACE_TEXT ("the main thread %t has started\n"))); // Create an "active" timer and start its thread. ActiveTimer atimer; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp index d44a5643019..16ce65aa5fd 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -168,12 +168,12 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-H high water mark]\n" "\t[-i number of test iterations]\n" "\t[-L low water mark]\n" - "\t[-M] message size \n" + "\t[-M] message size\n" "\t[-n] (THR_NEW_LWP)\n" "\t[-q max queue size]\n" "\t[-s supplier port]\n" "\t[-t number of threads]\n" - "\t[-v] (verbose) \n", + "\t[-v] (verbose)\n", ACE_TEXT_ALWAYS_CHAR (argv[0])); ACE_OS::exit (1); /* NOTREACHED */ diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index f3ac967e554..9fced9b8059 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -406,7 +406,7 @@ Peer_Handler::svc (void) ACE_TEXT ("unbind failed")), -1); LM_DEBUG ((LOG_DEBUG, - ACE_TEXT ("(%t) shutting down \n"))); + ACE_TEXT ("(%t) shutting down\n"))); // We do not need to be deregistered by reactor // as we were not registered at all. diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp index 37bbaad7d3d..56327d405bd 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -47,7 +47,7 @@ Event_Transceiver::parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("usage: %n [-CS] [-h host_name] [-p portnum] \n")), + ACE_TEXT ("usage: %n [-CS] [-h host_name] [-p portnum]\n")), -1); /* NOTREACHED */ break; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp index 69ed1441b05..0f7cccb2365 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -165,13 +165,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-H high water mark]\n" "\t[-i number of test iterations]\n" "\t[-L low water mark]\n" - "\t[-M] message size \n" + "\t[-M] message size\n" "\t[-n] (THR_NEW_LWP)\n" "\t[-q max queue size]\n" "\t[-S supplier file]\n" "\t[-s supplier port]\n" "\t[-t number of threads]\n" - "\t[-v] (verbose) \n", + "\t[-v] (verbose)\n", ACE_TEXT_ALWAYS_CHAR (argv[0])); ACE_OS::exit (1); /* NOTREACHED */ diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index b1f3755d9bd..65eb65a5609 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -84,7 +84,7 @@ Peer_Handler<ROUTER, KEY>::svc (void) if (this->router_task_->unbind_peer (this->get_handle ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("unbind failed")), -1); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shutting down\n"))); return -1; // We do not need to be deregistered by reactor // as we were not registered at all } diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index f05c38ce59b..23b8457b0ac 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -112,7 +112,7 @@ int Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in handle_close \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in handle_close\n"))); // Signal the svc() event loop to shut down. this->finished_ = 1; diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp index 91c682e4fbe..9d847d843e4 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp @@ -90,7 +90,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Point-to-point connection // Not sure why but reuse_addr set to true/1 causes problems for // FORE/XTI/ATM - this is now handled in ACE_ATM_Connector::connect() - ACE_OS::printf( "ATM_Client: to open a connection \n" ); + ACE_OS::printf( "ATM_Client: to open a connection\n" ); ACE_ATM_Params params = ACE_ATM_Params(); if (con.connect (atm_stream, hosts[ 0 ], diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index bfd86b5138d..704d0b35ab6 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -225,7 +225,7 @@ Handler::open (void *) 0); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client %C connected from %d \n"), + ACE_TEXT ("(%P|%t) client %C connected from %d\n"), cli_addr.get_host_name (), cli_addr.get_port_number ())); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp index c1f173cd72f..d0c512ea554 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server.cpp @@ -254,8 +254,8 @@ oneway_server (void *arg) timer.elapsed_time (et); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\t\treal time = %f secs \n") - ACE_TEXT ("\t\tuser time = %f secs \n") + ACE_TEXT ("\t\treal time = %f secs\n") + ACE_TEXT ("\t\tuser time = %f secs\n") ACE_TEXT ("\t\tsystem time = %f secs\n"), et.real_time, et.user_time, diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 8ef43514e9b..9ef416308b0 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp @@ -186,7 +186,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -204,13 +204,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -223,16 +223,16 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a receiver. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a receiver. qos_session->flags (ACE_QoS_Session::ACE_QOS_RECEIVER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -248,11 +248,11 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register a signal handler that helps to gracefully close the // open QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); - + // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -262,7 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Receiver_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -280,13 +280,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) "Error in registering the Decorator with the Reactor\n"), -1); - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp index c721aa810c4..5aedacb3303 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp @@ -190,7 +190,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -208,13 +208,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -227,22 +227,22 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a sender. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a sender. qos_session->flags (ACE_QoS_Session::ACE_QOS_SENDER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Since we are using RSVP, it is imperative that the client // application have the option of supplying the source sender // port for the RSVP messages. A default will be chosen by the // ACE API if this is not done. qos_session->source_port (qos_util.source_port ()); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -254,7 +254,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) else ACE_DEBUG ((LM_DEBUG, "Setting QOS succeeds.\n")); - + // Register a signal handler that helps to gracefully close the open // QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); @@ -262,7 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -272,7 +272,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Sender_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -292,13 +292,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp index e5702b90c1c..f329560dece 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp @@ -186,7 +186,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -204,13 +204,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -223,16 +223,16 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a receiver. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a receiver. qos_session->flags (ACE_QoS_Session::ACE_QOS_RECEIVER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -248,11 +248,11 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register a signal handler that helps to gracefully close the // open QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); - + // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -262,7 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Receiver_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -292,20 +292,20 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // // The following event handler handles the data. // ACE_QoS_Event_Handler data_event_handler (dgram_mcast_qos, // qos_session); - + // // Register the Data Event Handler with the Reactor. -// if (ACE_Reactor::instance ()->register_handler +// if (ACE_Reactor::instance ()->register_handler // (&data_event_handler,ACE_Event_Handler::READ_MASK) == -1) // ACE_ERROR_RETURN ((LM_ERROR, // "Error in registering Data Event Handler\n"), // -1); - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp index 68d8d1a5586..1af380f90b3 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp @@ -190,7 +190,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -208,13 +208,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -227,22 +227,22 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a sender. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a sender. qos_session->flags (ACE_QoS_Session::ACE_QOS_SENDER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Since we are using RSVP, it is imperative that the client // application have the option of supplying the source sender // port for the RSVP messages. A default will be chosen by the // ACE API if this is not done. qos_session->source_port (qos_util.source_port ()); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -254,7 +254,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) else ACE_DEBUG ((LM_DEBUG, "Setting QOS succeeds.\n")); - + // Register a signal handler that helps to gracefully close the open // QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); @@ -262,7 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -272,7 +272,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Sender_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -289,13 +289,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Decorator with the Reactor\n"), -1); - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/QOS/Simple/receiver.cpp b/ACE/examples/QOS/Simple/receiver.cpp index 72381d64f69..cba39f779e1 100644 --- a/ACE/examples/QOS/Simple/receiver.cpp +++ b/ACE/examples/QOS/Simple/receiver.cpp @@ -187,7 +187,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -205,13 +205,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -224,16 +224,16 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a receiver. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a receiver. qos_session->flags (ACE_QoS_Session::ACE_QOS_RECEIVER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -249,11 +249,11 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register a signal handler that helps to gracefully close the // open QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); - + // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -263,7 +263,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Receiver_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -281,13 +281,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) "Error in registering the Decorator with the Reactor\n"), -1); - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/QOS/Simple/sender.cpp b/ACE/examples/QOS/Simple/sender.cpp index 97e6aafa407..43684703be5 100644 --- a/ACE/examples/QOS/Simple/sender.cpp +++ b/ACE/examples/QOS/Simple/sender.cpp @@ -190,7 +190,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); else ACE_DEBUG ((LM_DEBUG, - "Dgram_Mcast subscribe succeeds \n")); + "Dgram_Mcast subscribe succeeds\n")); int nIP_TTL = 25; char achInBuf [BUFSIZ]; @@ -208,13 +208,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Multicast scope ACE_OS::ioctl() \n")); + "Error in Multicast scope ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds \n")); - + "Setting TTL with Multicast scope ACE_OS::ioctl call succeeds\n")); + int bFlag = 0; - + // Should this be abstracted into QoS objects ?? Doesnt seem to have // to do anything directly with QoS. if (ACE_OS::ioctl (dgram_mcast_qos.get_handle (), // Socket. @@ -227,22 +227,22 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) 0, // Overlapped. 0) == -1) // Func. ACE_ERROR ((LM_ERROR, - "Error in Loopback ACE_OS::ioctl() \n")); + "Error in Loopback ACE_OS::ioctl()\n")); else ACE_DEBUG ((LM_DEBUG, - "Disable Loopback with ACE_OS::ioctl call succeeds \n")); - - // This is a sender. + "Disable Loopback with ACE_OS::ioctl call succeeds\n")); + + // This is a sender. qos_session->flags (ACE_QoS_Session::ACE_QOS_SENDER); - + ACE_QoS_Manager qos_manager = dgram_mcast_qos.qos_manager (); - + // Since we are using RSVP, it is imperative that the client // application have the option of supplying the source sender // port for the RSVP messages. A default will be chosen by the // ACE API if this is not done. qos_session->source_port (qos_util.source_port ()); - + // Set the QoS for the session. Replaces the ioctl () call that // was being made previously. if (qos_session->qos (&dgram_mcast_qos, @@ -254,7 +254,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) else ACE_DEBUG ((LM_DEBUG, "Setting QOS succeeds.\n")); - + // Register a signal handler that helps to gracefully close the open // QoS sessions. QoS_Signal_Handler qos_signal_handler (qos_session); @@ -262,7 +262,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) // Register the usual SIGINT signal handler with the Reactor for // the application to gracefully release the QoS session and // shutdown. - if (ACE_Reactor::instance ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, &qos_signal_handler) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Error in registering the Signal Handler.\n"), @@ -272,7 +272,7 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) Sender_QoS_Event_Handler qos_event_handler (dgram_mcast_qos, qos_session); - // Decorate the above handler with QoS functionality. + // Decorate the above handler with QoS functionality. ACE_QoS_Decorator qos_decorator (&qos_event_handler, qos_session); @@ -291,13 +291,13 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); - + // Start the event loop. ACE_DEBUG ((LM_DEBUG, - "Running the Event Loop ... \n")); - + "Running the Event Loop ...\n")); + ACE_Reactor::instance ()->run_event_loop (); - + ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down server logging daemon\n")); } diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp index 1eaf0c5b176..ce24d5f5ef1 100644 --- a/ACE/examples/Reactor/Proactor/post_completions.cpp +++ b/ACE/examples/Reactor/Proactor/post_completions.cpp @@ -186,7 +186,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_UNUSED_ARG (argv); ACE_DEBUG ((LM_DEBUG, - "(%P | %t):Test starts \n")); + "(%P | %t):Test starts\n")); // = Get two POSIX_SIG_Proactors, one with SIGRTMIN and one with // SIGRTMAX. diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp index 5fc1737fae7..944719968f1 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp @@ -215,12 +215,12 @@ query_aio_completions (void) if (number_of_compleions == 0) // Print the buffer. - printf ("Number of bytes transferred : %d\n The buffer : %s \n", + printf ("Number of bytes transferred : %d\n The buffer : %s\n", nbytes, mb1); else // Print the buffer. - printf ("Number of bytes transferred : %d\n The buffer : %s \n", + printf ("Number of bytes transferred : %d\n The buffer : %s\n", nbytes, mb2); } diff --git a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp index 3a76ea81251..fab137a4c02 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp @@ -290,7 +290,7 @@ query_aio_completions (void) // may easily overrun the ACE_Log_Msg output buffer. If you need // to turn the on for some reason, be careful of this. #if 0 - ACE_DEBUG ((LM_DEBUG, "The buffer : %s \n", mb1.rd_ptr ())); + ACE_DEBUG ((LM_DEBUG, "The buffer : %s\n", mb1.rd_ptr ())); #endif /* 0 */ } else @@ -300,7 +300,7 @@ query_aio_completions (void) "\n Number of bytes transferred : %d\n", nbytes)); #if 0 - ACE_DEBUG ((LM_DEBUG, "The buffer : %s \n", mb2.rd_ptr ())); + ACE_DEBUG ((LM_DEBUG, "The buffer : %s\n", mb2.rd_ptr ())); #endif /* 0 */ } } diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp index db1e6645bec..2a87b875afe 100644 --- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp +++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp @@ -83,7 +83,7 @@ public: if (this->time_flag_) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t):Going to do *timed* <run_event_loop> \n")); + "(%P|%t):Going to do *timed* <run_event_loop>\n")); ACE_Time_Value run_time (13); @@ -95,7 +95,7 @@ public: else { ACE_DEBUG ((LM_DEBUG, - "(%P|%t):Going to do *indefinite* <run_event_loop> \n")); + "(%P|%t):Going to do *indefinite* <run_event_loop>\n")); if (ACE_Proactor::instance ()->run_event_loop () == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t):%p.\n", @@ -117,7 +117,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) ACE_UNUSED_ARG (argv); ACE_DEBUG ((LM_DEBUG, - "(%P | %t):Test starts \n")); + "(%P | %t):Test starts\n")); // Let us get the singleton proactor created here. This is very // important. This will mask the signal used in the Proactor masked diff --git a/ACE/examples/Threads/auto_event.cpp b/ACE/examples/Threads/auto_event.cpp index e568ffe84d1..21ecbee830c 100644 --- a/ACE/examples/Threads/auto_event.cpp +++ b/ACE/examples/Threads/auto_event.cpp @@ -36,7 +36,7 @@ reader (void *arg) // Wait for writer to complete. - ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting...... \n")); + ACE_DEBUG ((LM_DEBUG, "(%t) reader: waiting......\n")); if (EVENT::instance ()->wait () == -1) { @@ -45,7 +45,7 @@ reader (void *arg) } // Read shared data. - ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d \n", data)); + ACE_DEBUG ((LM_DEBUG, "(%t) reader: value of data is: %d\n", data)); return 0; } diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp index d4b37975f23..0e1e76bfd8e 100644 --- a/ACE/examples/Threads/manual_event.cpp +++ b/ACE/examples/Threads/manual_event.cpp @@ -71,14 +71,14 @@ worker (void *arg) ACE_OS::sleep (::amount_of_work.value ()); // synch with everybody else - ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others \n")); + ACE_DEBUG ((LM_DEBUG, "(%t) waiting to synch with others\n")); thread_barrier.wait (); // more work ACE_DEBUG ((LM_DEBUG, "(%t) more work (%d secs)\n", ++::amount_of_work)); ACE_OS::sleep (::amount_of_work.value ()); - ACE_DEBUG ((LM_DEBUG, "(%t) dying \n")); + ACE_DEBUG ((LM_DEBUG, "(%t) dying\n")); return 0; } diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index 8503c295db4..d139bca0c87 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -239,7 +239,7 @@ Async_Timer_Queue_Test_Driver::display_menu (void) // The menu of options provided to the user. static char menu[] = "****\n" - "1) schedule timer <usecs> \n" + "1) schedule timer <usecs>\n" "2) cancel timer <timer_id>\n" "^C list timers\n" "^\\ exit program\n"; diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index cdd036e4044..fd87cae7149 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -40,7 +40,7 @@ Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) // problme of Display () not printing the right hostname ACE_OS::strcpy (this->hostname_, this->name_options_->nameserver_host ()); - this->port_ = + this->port_ = this->name_options_->nameserver_port (); if (this->ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1) @@ -193,7 +193,7 @@ Dump_Restore::display_menu (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<D> Dump <file name>\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("<Q> or ^C (exit) \n"))); + ACE_TEXT ("<Q> or ^C (exit)\n"))); } @@ -331,7 +331,7 @@ Dump_Restore::populate (Dump_Restore::Operation_Type op) allocator); for (char *temp; - (temp = read_buffer.read ('\n')) != 0; + (temp = read_buffer.read ('\n')) != 0; ) { char *name = 0; @@ -421,7 +421,7 @@ Dump_Restore::unbind (const char *key) int result = ns_context_->unbind (key); if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ns_context_->unbind")), -1); @@ -433,7 +433,7 @@ Dump_Restore::rebind (const char *key, const char *value, const char *type) { - if (ns_context_->rebind (key, + if (ns_context_->rebind (key, value, type) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/netsvcs/lib/Name_Handler.cpp b/ACE/netsvcs/lib/Name_Handler.cpp index aba554af988..99e675243a0 100644 --- a/ACE/netsvcs/lib/Name_Handler.cpp +++ b/ACE/netsvcs/lib/Name_Handler.cpp @@ -369,7 +369,7 @@ ACE_Name_Handler::shared_bind (int rebind) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for BIND \n"))); + ACE_TEXT ("request for BIND\n"))); #endif /* 0 */ result = this->naming_context ()->bind (a_name, a_value, @@ -379,7 +379,7 @@ ACE_Name_Handler::shared_bind (int rebind) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for REBIND \n"))); + ACE_TEXT ("request for REBIND\n"))); #endif /* 0 */ result = this->naming_context ()->rebind (a_name, a_value, @@ -398,7 +398,7 @@ ACE_Name_Handler::resolve (void) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::resolve")); #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for RESOLVE\n"))); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); @@ -431,7 +431,7 @@ ACE_Name_Handler::unbind (void) { ACE_TRACE (ACE_TEXT ("ACE_Name_Handler::unbind")); #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("request for UNBIND\n"))); #endif /* 0 */ ACE_NS_WString a_name (this->name_request_.name (), this->name_request_.name_len () / sizeof (ACE_WCHAR_T)); @@ -549,7 +549,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_NAME_ENTRIES \n"))); + ACE_TEXT ("request for LIST_NAME_ENTRIES\n"))); #endif /* 0 */ result = this->naming_context ()-> ACE_Naming_Context::list_name_entries (set, pattern); @@ -558,7 +558,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_VALUE_ENTRIES \n"))); + ACE_TEXT ("request for LIST_VALUE_ENTRIES\n"))); #endif /* 0 */ result = this->naming_context ()-> ACE_Naming_Context::list_value_entries (set, pattern); @@ -567,7 +567,7 @@ ACE_Name_Handler::lists_entries (void) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("request for LIST_TYPE_ENTRIES \n"))); + ACE_TEXT ("request for LIST_TYPE_ENTRIES\n"))); #endif /* 0 */ result = this->naming_context ()-> ACE_Naming_Context::list_type_entries (set, pattern); diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp index 679249ebf15..d85fcfd7acf 100644 --- a/ACE/performance-tests/SCTP/Options_Manager.cpp +++ b/ACE/performance-tests/SCTP/Options_Manager.cpp @@ -523,9 +523,9 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set) if (ACE_OS::strstr(__program_name, ACE_TEXT ("SOCK_SEQPACK_srv"))) { ACE_OS::fprintf (out, " -a w.x.y.z,a.b.c.d,... server-accept-addr INADDR_ANY\n" - " (comma-separated \n" - " list of one or more \n" - " addresses) \n"); + " (comma-separated \n" + " list of one or more \n" + " addresses) \n"); } else { ACE_OS::fprintf (out, " -a w.x.y.z server-accept-addr INADDR_ANY\n"); } diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index d31b85d90b2..8faa65c4de2 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -64,7 +64,7 @@ Synchronisers::start_synchronization (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Ready to go.. \n")); + "(%P|%t) Ready to go..\n")); } if (ready_threads == number_of_threads) @@ -106,7 +106,7 @@ Synchronisers::end_synchronization (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Ready to go.. \n")); + "(%P|%t) Ready to go..\n")); } if (ready_threads == number_of_threads) @@ -347,7 +347,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (result != 0) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) - Failed again no hope \n")); + "(%P|%t) - Failed again no hope\n")); return 0; } @@ -368,14 +368,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Throughput is [%f] \n", + "(%P|%t) Throughput is [%f]\n", 1000000000/ elapsed_time_per_invocation)); for (i = 0; i < number_of_threads; ++i) { ACE_DEBUG ((LM_DEBUG, - "Message consumed in thread [%d] is [%d] \n", + "Message consumed in thread [%d] is [%d]\n", i, leader_followers[i]->processed ())); delete leader_followers[i]; } @@ -394,7 +394,7 @@ int ACE_TMAIN(int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, - "(%p|%t) Cannot run in SIngle threaded mode \n")); + "(%p|%t) Cannot run in SIngle threaded mode\n")); return 0; } diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp index 543de4f60d9..9e76e3f0b6a 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp @@ -62,7 +62,7 @@ Synchronisers::start_synchronization (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Ready to signal start \n")); + "(%P|%t) Ready to signal start\n")); } // Start the timer test_timer.start (); @@ -81,7 +81,7 @@ Synchronisers::start_synchronization (void) { //FUZZ: disable check_for_lack_ACE_OS ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Ready to wait () on event.. \n")); + "(%P|%t) Ready to wait () on event..\n")); //FUZZ: enable check_for_lack_ACE_OS } @@ -116,7 +116,7 @@ Synchronisers::end_synchronization (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Ended peacefully \n")); + "(%P|%t) Ended peacefully\n")); } // return to do our work; @@ -130,7 +130,7 @@ Synchronisers::end_synchronization (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Going to wait .. \n")); + "(%P|%t) Going to wait ..\n")); } // Wait blisfully till we are woken up @@ -235,7 +235,7 @@ Worker_Task::svc (void) { if (debug) ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Got stop message after [%d] messages \n", + "(%P|%t) Got stop message after [%d] messages\n", this->messages_processed_)); break; @@ -300,7 +300,7 @@ Input_Task::svc (void) if (debug) { ACE_DEBUG ((LM_DEBUG, - "(%t) Sending close messages \n")); + "(%t) Sending close messages\n")); } @@ -388,7 +388,7 @@ Output_Task::put (ACE_Message_Block *mb, ACE_Time_Value *) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sticking message into " - " output queue \n")); + " output queue\n")); }*/ return this->putq (mb); } @@ -556,18 +556,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) (double) elapsed_time / number_of_messages; ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Throughput is [%f] \n", + "(%P|%t) Throughput is [%f]\n", elapsed_time_per_invocation)); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Throughput is [%f] \n", + "(%P|%t) Throughput is [%f]\n", 1000000000/ elapsed_time_per_invocation)); #endif /*ACE_WIN32 */ for (i = 0; i < number_of_workers; ++i) { ACE_DEBUG ((LM_DEBUG, - "Message process for thread [%d] is [%d] \n", + "Message process for thread [%d] is [%d]\n", i, workers[i]->processed ())); delete workers[i]; } @@ -582,7 +582,7 @@ int ACE_TMAIN(int, ACE_TCHAR *[]) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Not supported in single threaded builds \n")); + "(%P|%t) Not supported in single threaded builds\n")); return 0; } diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp index d2f5305de07..59f4e698d28 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp @@ -206,8 +206,8 @@ Performance_Test_Options::parse_args (int argc, ACE_TCHAR *argv[]) "\t[-S] service entry\n" "\t[-t] number of threads [%d]\n" "\t[-T] (enable tracing)\n" - "\t[-u] (UDP) \n" - "\t[-v] (verbose) \n" + "\t[-u] (UDP)\n" + "\t[-v] (verbose)\n" "\t[-X] (enable xdr conversion)\n" "\t[-Z] (enable zero-copy driver)\n%a", argv[0], diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index 3aceb05b449..e2b202326d7 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -84,7 +84,7 @@ usage (void) " [-m message size]\n" " [-i iterations]\n" " [-I usdelay]\n" - " [-b socket bufsz] \n" + " [-b socket bufsz]\n" " [-p port]\n" " [-s]\n" " [-c]\n" @@ -93,7 +93,7 @@ usage (void) " [-a to use the ACE Select reactor]\n" " [-x to use the ACE TP reactor]\n" " [-w to use the ACE WFMO reactor]\n" - " targethost \n")); + " targethost\n")); } // **************************************************************** diff --git a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp index a00dd8671f2..e86aba3d2e9 100644 --- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -474,7 +474,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (ack != data_buf_len) ACE_DEBUG ((LM_DEBUG, "received ack for only %d bytes\n", ack)); } - printf("Client finished. \n"); + printf("Client finished.\n"); } else { @@ -520,7 +520,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "ttcp"), -1); } - printf("Server finished. \n"); + printf("Server finished.\n"); } /* if (errno) diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp index 14df97f4a08..2d5d0f093e2 100644 --- a/ACE/performance-tests/UDP/udp_test.cpp +++ b/ACE/performance-tests/UDP/udp_test.cpp @@ -72,13 +72,13 @@ usage (void) " [-b send_bufsz]\n" " [-n nsamples]\n" " [-I usdelay]\n" - " [-s so_bufsz] \n" + " [-s so_bufsz]\n" " [-p port]\n" " [-t]\n" " [-r]\n" " [-x max_sample_allowed]\n" " [-a to use the ACE reactor]\n" - " targethost \n", + " targethost\n", *cmd)); } @@ -435,7 +435,7 @@ Client::run (void) if (logfile) { ACE_OS::fprintf (sumfp, - "Command executed: \n"); + "Command executed:\n"); for (; *cmd; cmd++) ACE_OS::fprintf (sumfp, "%s ", diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp index 7bc3d8ac0ee..af9f211c48c 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp @@ -149,7 +149,7 @@ Accept_Handler::handle_input (ACE_HANDLE h) if ((*ch)->state() == ACE::HTBP::Channel::Data_Queued) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Server Accept_Handler::handle_input \n"), + ACE_TEXT ("(%P|%t) Server Accept_Handler::handle_input\n"), ACE_TEXT ("Issuing notification on handler\n"))); this->reactor()->notify (session->handler(), ACE_Event_Handler::READ_MASK); diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp index 34f037148c5..724a14b2da3 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp @@ -140,7 +140,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) Server: ") - ACE_TEXT("received %b \n"),total_recv)); + ACE_TEXT("received %b\n"),total_recv)); ACE_OS::strcpy (buffer,"I hear you !"); diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp index 2f559e03b29..2ad433e70ea 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/client.cpp @@ -131,7 +131,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("(%P|%t) connected to %C\n"), remote.get_host_name ())); - ACE_DEBUG ((LM_DEBUG, "(%P) ***** client TEST 1 ***** \n")); + ACE_DEBUG ((LM_DEBUG, "(%P) ***** client TEST 1 *****\n")); //******************* TEST 1 ****************************** // @@ -184,7 +184,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // ACE_OS::sleep (10); - ACE_DEBUG ((LM_DEBUG, "(%P) ***** client TEST 2 ***** \n")); + ACE_DEBUG ((LM_DEBUG, "(%P) ***** client TEST 2 *****\n")); //******************* TEST 2 ****************************** // diff --git a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp index c8d4153a392..aec607eb629 100644 --- a/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Recv_Tests/server.cpp @@ -183,7 +183,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cli_addr.get_port_number ())); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) ***** server TEST 1 ***** \n"))); + ACE_TEXT("(%P) ***** server TEST 1 *****\n"))); //******************* TEST 1 ****************************** // // Do a iovec recvv - the client should send 255 bytes, which we @@ -232,7 +232,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) ***** server TEST 2 ***** \n"))); + ACE_TEXT("(%P) ***** server TEST 2 *****\n"))); //******************* TEST 2 ****************************** // diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index f6aa7d02e0e..835bef0355d 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -544,7 +544,7 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array, if (is.good_bit () != 0) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Test for good bit failed in %s Array_test \n"), + ACE_TEXT ("Test for good bit failed in %s Array_test\n"), H::name ())); } } diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index 49bfde79de3..75b5f24c1d5 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -585,12 +585,12 @@ run_main (int argc, ACE_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Output CDR: \n"))); + ACE_TEXT ("Output CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input CDR: \n"))); + ACE_TEXT ("Input CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); @@ -616,12 +616,12 @@ run_main (int argc, ACE_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Output CDR: \n"))); + ACE_TEXT ("Output CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input CDR: \n"))); + ACE_TEXT ("Input CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); @@ -654,12 +654,12 @@ run_main (int argc, ACE_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Output CDR: \n"))); + ACE_TEXT ("Output CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input CDR: \n"))); + ACE_TEXT ("Input CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); @@ -680,12 +680,12 @@ run_main (int argc, ACE_TCHAR *argv[]) if (debug > 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Output CDR: \n"))); + ACE_TEXT ("Output CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Input CDR: \n"))); + ACE_TEXT ("Input CDR:\n"))); ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64)); diff --git a/ACE/tests/Cache_Map_Manager_Test.cpp b/ACE/tests/Cache_Map_Manager_Test.cpp index 400235216e0..2b0fe6cce52 100644 --- a/ACE/tests/Cache_Map_Manager_Test.cpp +++ b/ACE/tests/Cache_Map_Manager_Test.cpp @@ -517,7 +517,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("[-i (iterations)] ") ACE_TEXT ("[-d (debug, i.e., addition printouts)] ") ACE_TEXT ("[-p (purge percent)] ") - ACE_TEXT ("[-f (number of lookups)] \n"), + ACE_TEXT ("[-f (number of lookups)]\n"), ACE_TEXT ("Cache_Map_Manager_Test"))); return -1; } diff --git a/ACE/tests/DLList_Test.cpp b/ACE/tests/DLList_Test.cpp index 57155d177ab..8dc77be3422 100644 --- a/ACE/tests/DLList_Test.cpp +++ b/ACE/tests/DLList_Test.cpp @@ -84,13 +84,13 @@ run_test (void) if (ACE_EVEN (i) && list.insert_tail ((ACE_STRING *) &string_table[i]) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p failed for %s \n"), + ACE_TEXT ("%p failed for %s\n"), ACE_TEXT ("insert"), string_table[i]), -1); else if (list.insert_head ((ACE_STRING *) &string_table[i]) == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p failed for %s \n"), + ACE_TEXT ("%p failed for %s\n"), ACE_TEXT ("insert"), string_table[i]), -1); diff --git a/ACE/tests/Get_Opt_Test.cpp b/ACE/tests/Get_Opt_Test.cpp index 5f9ca406fde..8acabb3a131 100644 --- a/ACE/tests/Get_Opt_Test.cpp +++ b/ACE/tests/Get_Opt_Test.cpp @@ -77,37 +77,37 @@ parse_args (int test_number, 'f', ACE_Get_Opt::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add long option 'f' \n")), 1); + ACE_TEXT (" Unable to add long option 'f'\n")), 1); if (get_opt.long_option (ACE_TEXT ("requires_arg"), 'r', ACE_Get_Opt::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add long option 'r' \n")), 1); + ACE_TEXT (" Unable to add long option 'r'\n")), 1); if (get_opt.long_option (ACE_TEXT ("optional_arg"), 'o', ACE_Get_Opt::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add long option 'o' \n")), 1); + ACE_TEXT (" Unable to add long option 'o'\n")), 1); if (get_opt.long_option (ACE_TEXT ("long_option"), 'l', ACE_Get_Opt::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" Unable to add long option 'l' \n")), 1); + ACE_TEXT (" Unable to add long option 'l'\n")), 1); if (get_opt.long_option (ACE_TEXT ("long_only"), -11, ACE_Get_Opt::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") - ACE_TEXT ("\"long_only\" \n")), 1); + ACE_TEXT ("\"long_only\"\n")), 1); if (get_opt.long_option (ACE_TEXT ("long_no_arg")) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") - ACE_TEXT ("\"long_no_arg\" \n")), 1); + ACE_TEXT ("\"long_no_arg\"\n")), 1); // This is the special case of providing a non-alpha numeric corresponding // short option. This lets you use the corresponding short option in a @@ -118,7 +118,7 @@ parse_args (int test_number, ACE_Get_Opt::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") - ACE_TEXT ("\"non_alpha_short\" \n")), 1); + ACE_TEXT ("\"non_alpha_short\"\n")), 1); // We print out the optstring here because adding long_options that // have corresponding short options that aren't yet present, are added. diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp index e960e127f8c..9776b7104d3 100644 --- a/ACE/tests/Hash_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Map_Manager_Test.cpp @@ -198,7 +198,7 @@ run_test (void) if (hash.bind (string_table[i].key_, string_table[i].value_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p failed for %s \n"), + ACE_TEXT ("%p failed for %s\n"), ACE_TEXT ("bind"), string_table[i].key_), -1); @@ -313,7 +313,7 @@ run_test (void) if (hash.bind (string_table[i].key_, string_table[i].value_) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p failed for %s \n"), + ACE_TEXT ("%p failed for %s\n"), ACE_TEXT ("bind"), string_table[i].key_), -1); diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp index 2e883a71152..03946f8b0d0 100644 --- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp @@ -55,7 +55,7 @@ run_test (void) warm_colors[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed for %s in %s\n"), - warm_colors[i], + warm_colors[i], color_sorts[0]), -1); } @@ -68,11 +68,11 @@ run_test (void) entry) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed for %s in %s\n"), - cold_colors[i], + cold_colors[i], color_sorts[1]), -1); } - + HASH_STRING_VALUE_SET value_set; entry = 0; for (i = 0; neutral_colors[i] != 0; i++) @@ -258,11 +258,11 @@ run_test (void) iter++) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s \n"), + ACE_TEXT ("%s \n"), *iter)); } } - + // Check the unbind operation. if (colors.unbind (color_sorts[0]) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -275,7 +275,7 @@ run_test (void) warm_colors[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed for %s in %s\n"), - warm_colors[i], + warm_colors[i], color_sorts[0]), -1); } @@ -292,7 +292,7 @@ run_test (void) warm_colors[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed for %s in %s\n"), - warm_colors[i], + warm_colors[i], color_sorts[0]), -1); } @@ -303,7 +303,7 @@ run_test (void) warm_colors[i]) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("unbind failed for %s in %s\n"), - warm_colors[i], + warm_colors[i], color_sorts[0]), -1); } @@ -326,7 +326,7 @@ run_test (void) iter++) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s \n"), + ACE_TEXT ("%s \n"), *iter)); } } @@ -357,7 +357,7 @@ run_test (void) iter++) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s \n"), + ACE_TEXT ("%s \n"), *iter)); } } diff --git a/ACE/tests/IOStream_Test.cpp b/ACE/tests/IOStream_Test.cpp index 263cbb53d43..f4275c3ecba 100644 --- a/ACE/tests/IOStream_Test.cpp +++ b/ACE/tests/IOStream_Test.cpp @@ -375,7 +375,7 @@ server (void *arg = 0) ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (" (%P|%t) Server Sending: 1 .12342134 666555444 23.45 -46.5e9 \n"))); + ACE_TEXT (" (%P|%t) Server Sending: 1 .12342134 666555444 23.45 -46.5e9\n"))); client_handler << 1 << " "; client_handler << .12342134 << " "; client_handler << 666555444 << " "; diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index dde23f13df1..31b8b610399 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -108,7 +108,7 @@ static void print_till_death (void) { ACE_DEBUG ((LM_DEBUG, - "\n-> start generating messages... \n")); + "\n-> start generating messages...\n")); for (int i = 0; i < 1000; i++) { @@ -191,7 +191,7 @@ count_files (void) num_files)); ACE_DEBUG ((LM_DEBUG, - "\n-< counting finished... \n")); + "\n-< counting finished...\n")); } // get the file statistics @@ -200,7 +200,7 @@ static time_t get_statistics (ACE_TCHAR *f_name) { ACE_stat buf; - + // Get data associated with "file_name": int result = ACE_OS::stat (f_name, &buf); @@ -230,7 +230,7 @@ static void order (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n-> start testing order... \n"))); + ACE_TEXT ("\n-> start testing order...\n"))); if (num_files <= 2) { diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index 45bd1924a92..3cc4b712184 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -1141,7 +1141,7 @@ testing (ACE_Reactor *reactor, int nested_upcalls) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n(%t) Configuration: \n") + ACE_TEXT ("\n(%t) Configuration:\n") ACE_TEXT ("\tInvocation thread = %d\n") ACE_TEXT ("\tEvent Loop thread = %d\n") ACE_TEXT ("\tPurger thread = %d\n") diff --git a/ACE/tests/Max_Default_Port_Test.cpp b/ACE/tests/Max_Default_Port_Test.cpp index 6b4fc0bb5a5..3c9f30cbf91 100644 --- a/ACE/tests/Max_Default_Port_Test.cpp +++ b/ACE/tests/Max_Default_Port_Test.cpp @@ -87,7 +87,7 @@ My_Accept_Handler::handle_input (ACE_HANDLE) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("My_Accept_Handler::handle_input \n"))); + ACE_TEXT ("My_Accept_Handler::handle_input\n"))); // Close the opened stream, else it'll leak a handle. Don't close // the acceptor here, though, because get_handle() needs it to @@ -186,7 +186,7 @@ run_main (int argc, ACE_TCHAR *argv[]) #else const u_short ports_to_test = 300; #endif - + //Ports beyond 65279 were said to bad on NT sp 3. for (u_short idx = USHRT_MAX; idx != USHRT_MAX - ports_to_test; --idx) { diff --git a/ACE/tests/Max_Default_Port_Test_IPV6.cpp b/ACE/tests/Max_Default_Port_Test_IPV6.cpp index bc0e9809ee0..29a5c29dc5b 100644 --- a/ACE/tests/Max_Default_Port_Test_IPV6.cpp +++ b/ACE/tests/Max_Default_Port_Test_IPV6.cpp @@ -75,7 +75,7 @@ My_Accept_Handler::handle_input (ACE_HANDLE) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("My_Accept_Handler::handle_input \n"))); + ACE_TEXT ("My_Accept_Handler::handle_input\n"))); // Close the opened stream, else it'll leak a handle. Don't close // the acceptor here, though, because get_handle() needs it to diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 51fe8c261b3..75a3abbfcbb 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -223,7 +223,7 @@ Watermark_Test::producer (void) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Producer: High water mark hit ---- \n"))); + ACE_TEXT ("(%P|%t) Producer: High water mark hit ----\n"))); ACE_MT (this->mq_full_.wait ()); diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index 5de0c7bd48c..251f2eb655d 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -602,7 +602,7 @@ MCT_Event_Handler::handle_input (ACE_HANDLE /*handle*/) ACE_DEBUG ((LM_ERROR, ACE_TEXT ("MCT_Event_Handler::handle_input - ") ACE_TEXT ("Received dgram for a group we didn't join ") - ACE_TEXT ("(%s) \n"), + ACE_TEXT ("(%s)\n"), buf)); } return 0; diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 337d3a43b5c..854d1713cad 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -614,7 +614,7 @@ MCT_Event_Handler::handle_input (ACE_HANDLE /*handle*/) ACE_DEBUG ((LM_ERROR, ACE_TEXT ("MCT_Event_Handler::handle_input - ") ACE_TEXT ("Received dgram for a group we didn't join ") - ACE_TEXT ("(%s) \n"), + ACE_TEXT ("(%s)\n"), buf)); } return 0; diff --git a/ACE/tests/Naming_Test.cpp b/ACE/tests/Naming_Test.cpp index 89322d86f26..f4f624a8c63 100644 --- a/ACE/tests/Naming_Test.cpp +++ b/ACE/tests/Naming_Test.cpp @@ -49,7 +49,7 @@ print_time (ACE_Profile_Timer &timer, timer.stop (); timer.elapsed_time (et); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ***** %C ***** \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)); diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index ea976199864..d1488160643 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -144,12 +144,12 @@ Echo_Handler::open (ACE_Reactor * const reactor, if (this->reactor ()) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Echo_Handler::open - failed: ") - ACE_TEXT ("reactor is already set. \n")), + ACE_TEXT ("reactor is already set.\n")), -1); if (!reactor) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Echo_Handler::open - failed : ") - ACE_TEXT ("NULL pointer to reactor provided. \n")), + ACE_TEXT ("NULL pointer to reactor provided.\n")), -1); this->reactor (reactor); diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp index 17a47cfa2f1..a3d2175a009 100644 --- a/ACE/tests/Pipe_Test.cpp +++ b/ACE/tests/Pipe_Test.cpp @@ -42,7 +42,7 @@ print_usage_and_die (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-d (don't close pipes)] ") - ACE_TEXT ("[-c (child process)] [-i (iterations)] \n"))); + ACE_TEXT ("[-c (child process)] [-i (iterations)]\n"))); ACE_OS::exit (1); } diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 1891a92de76..95b116dc598 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -257,7 +257,7 @@ int DgramHandler::open (const ACE_INET_Addr &local, protocol, reuse_addr)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot oper dgram socket")), -1); @@ -280,7 +280,7 @@ int DgramHandler::handle_input (ACE_HANDLE handle) if (0 >= result) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("While reading datagram from socket")) , -1); else @@ -303,7 +303,7 @@ int DgramHandler::handle_timeout (const ACE_Time_Value ¤t_time, const void static_cast< ACE_UINT32 > (INADDR_ANY)), ACE_PROTOCOL_FAMILY_INET, 0, 1)) ACE_ERROR ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot open socket for sending Qt dgrams"))); ACE_INET_Addr peerAddr; @@ -312,7 +312,7 @@ int DgramHandler::handle_timeout (const ACE_Time_Value ¤t_time, const void if (sizeof (sendBuffer) != socket.send (&sendBuffer, sizeof (sendBuffer), peerAddr)) ACE_ERROR ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot send dgram"))); else ++dgramsSent_; @@ -396,7 +396,7 @@ int TCPConnectionHandler::handle_input (ACE_HANDLE handle) int result = scheduleSend (buffer); if (0 > result) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot schedule TCP reply")), -1); } @@ -476,7 +476,7 @@ int TCPConnectionHandler::scheduleSend (ACE_Message_Block * buffer) if (0 > sendBuffers ()) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot schedule TCP send.")), -1); return 0; @@ -615,7 +615,7 @@ int HandlersRegister::scheduleTimers (const ACE_Time_Value &p_TestTime) ACE_Time_Value::zero, p_TestTime * (0.5 / DgramsToSend))) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot schedule ACE timer")), -1); @@ -637,7 +637,7 @@ int HandlersRegister::registerDgramHandlers () ACE_TEXT ("127.0.0.1"), ACE_PROTOCOL_FAMILY_INET))) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot open dgram handler")), -1); @@ -646,7 +646,7 @@ int HandlersRegister::registerDgramHandlers () if (-1 == reactor_->register_handler (DgramHandlers_[ i ], ACE_Event_Handler::READ_MASK)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot register dgram handler")), -1); return 0; @@ -658,7 +658,7 @@ int HandlersRegister::registerTCPHandlers () if (-1 == acceptor_->open (addr, reactor_, 1)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT (" (%P) %p \n"), + ACE_TEXT (" (%P) %p\n"), ACE_TEXT ("Cannot open acceptor port")), -1); diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index a29ab26769c..7e22474d3b3 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -163,7 +163,7 @@ Event_Handler::run (void) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Test %C failed due to timeout ") - ACE_TEXT (" sent=%d,recv=%d \n"), + ACE_TEXT (" sent=%d,recv=%d\n"), test_name_, notifications_sent_, notifications_recv_)); diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index 7064b4b9151..715aaeaedb5 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -100,7 +100,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, // This event handler is being closed by the reactor unexpectedly. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Bogus_Handler unexpectedly closed\n ")), + ACE_TEXT ("Bogus_Handler unexpectedly closed\n")), -1); } @@ -343,7 +343,7 @@ handle_events (ACE_Reactor & reactor, timeout.sec (2); int const result = reactor.handle_events (&timeout); - + if (result > 0) { ACE_ERROR ((LM_ERROR, diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index cc3b52a6f0e..078ae9a7534 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -103,7 +103,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, // This event handler is being closed by the reactor unexpectedly. ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("Bogus_Handler unexpectedly closed\n ")), + ACE_TEXT ("Bogus_Handler unexpectedly closed\n")), -1); } @@ -346,7 +346,7 @@ handle_events (ACE_Reactor & reactor, timeout.sec (2); int const result = reactor.handle_events (&timeout); - + if (result > 0) { ACE_ERROR ((LM_ERROR, diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp index 0354483105d..1d79e8a0c53 100644 --- a/ACE/tests/Reactors_Test.cpp +++ b/ACE/tests/Reactors_Test.cpp @@ -252,7 +252,7 @@ run_main (int, ACE_TCHAR *[]) -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) all threads are finished \n"))); + ACE_TEXT ("(%t) all threads are finished\n"))); #else ACE_ERROR ((LM_INFO, diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index f23412cdd52..67283ab407e 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -361,7 +361,7 @@ Secondary_Ipaddr_Handler::Secondary_Ipaddr_Handler () Secondary_Ipaddr_Handler::~Secondary_Ipaddr_Handler () { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Secondary_Ipaddr_Handler::~Secondary_Ipaddr_Handler \n"))); + ACE_TEXT ("(%P|%t) Secondary_Ipaddr_Handler::~Secondary_Ipaddr_Handler\n"))); this->close (); } int @@ -374,7 +374,7 @@ Secondary_Ipaddr_Handler::open (ACE_Reactor *const reactor, !if_name || !ACE_OS::strlen (if_name)) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P) Secondary_Ipaddr_Handler::open: error ") - ACE_TEXT("zero pointers or zero length strings used as input. \n")), + ACE_TEXT("zero pointers or zero length strings used as input.\n")), -1); this->reactor (reactor); @@ -389,8 +389,8 @@ Secondary_Ipaddr_Handler::open (ACE_Reactor *const reactor, NETLINK_ROUTE) == -1) //FUZZ: disable check_for_lack_ACE_OS ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("(%P|%t) Secondary_Ipaddr_Handler::open: - failed \n") - ACE_TEXT("to initialize netlink socket bu open (). \n")), + ACE_TEXT("(%P|%t) Secondary_Ipaddr_Handler::open: - failed\n") + ACE_TEXT("to initialize netlink socket bu open ().\n")), -1); //FUZZ: enable check_for_lack_ACE_OS @@ -433,7 +433,7 @@ int Secondary_Ipaddr_Handler::handle_input (ACE_HANDLE) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - entered \n"))); + ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - entered\n"))); nlmsghdr *hdr = 0; iovec iov; @@ -485,7 +485,7 @@ Secondary_Ipaddr_Handler::handle_input (ACE_HANDLE) if (static_cast <int> (hdr->nlmsg_pid) != this->address_.get_pid () || hdr->nlmsg_seq != this->seq_) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - ") - ACE_TEXT("process id or message sequence is different \n")), + ACE_TEXT("process id or message sequence is different\n")), -1); if (hdr->nlmsg_type == NLMSG_ERROR) @@ -497,13 +497,13 @@ Secondary_Ipaddr_Handler::handle_input (ACE_HANDLE) { this->on_command_success (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - command success \n"))); + ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - command success\n"))); return 0; } this->on_command_error (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - command informs about error \n"))); + ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_input - command informs about error\n"))); // some error message ACE_OS::perror("rtnetlink error message: "); @@ -519,7 +519,7 @@ Secondary_Ipaddr_Handler::handle_timeout (ACE_Time_Value const &, void const *) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_timeout - entered \n"))); + ACE_TEXT("(%P) Secondary_Ipaddr_Handler::handle_timeout - entered\n"))); if (this->command_status_ != COMMAND_SUCCESS && (this->command_status_ != COMMAND_ERROR && @@ -594,7 +594,7 @@ Secondary_Ipaddr_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P|%t) Secondary_Ipaddr_Handler::handle_close \n"))); + ACE_TEXT("(%P|%t) Secondary_Ipaddr_Handler::handle_close\n"))); this->close (); return 0; } @@ -603,7 +603,7 @@ int Secondary_Ipaddr_Handler::close () { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT("(%P) Secondary_Ipaddr_Handler::close \n"))); + ACE_TEXT("(%P) Secondary_Ipaddr_Handler::close\n"))); if (this->reactor ()) { @@ -901,7 +901,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if ((ip_len == 0 && if_len) || (ip_len && if_len == 0)) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT("%s - error: both options -a and -i should be provided. \n"), + ACE_TEXT("%s - error: both options -a and -i should be provided.\n"), ACE_TEXT("SOCK_Netlink_Test")), -1); } diff --git a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp index 40ffec48c39..895d2d374d5 100644 --- a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp +++ b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp @@ -1,17 +1,17 @@ // $Id$ // -// *WARRANTY DISCLAIMER: LIMITATION OF LIABILITY. THE SOFTWARE AND -// CONTENT ARE PROVIDED "AS IS" WITH NO EXPRESS OR IMPLIED -// REPRESENTATIONS, GUARANTEES, OR WARRANTIES, INCLUDING BUT NOT LIMITED -// TO SUCH REPRESENTATION, GUARANTEES OR WARRANTIES REGARDING THE +// *WARRANTY DISCLAIMER: LIMITATION OF LIABILITY. THE SOFTWARE AND +// CONTENT ARE PROVIDED "AS IS" WITH NO EXPRESS OR IMPLIED +// REPRESENTATIONS, GUARANTEES, OR WARRANTIES, INCLUDING BUT NOT LIMITED +// TO SUCH REPRESENTATION, GUARANTEES OR WARRANTIES REGARDING THE // USABILITY, SUITABILITY, CONDITION, OPERATION OR ACCURACY THEREOF. * -// -// *ALL OTHER WARRANTIES AND CONDITIONS (EXPRESS, IMPLIED OR STATUTORY) -// ARE HEREBY DISCLAIMED, SUCH WARRANTIES AND CONDITIONS INCLUDING -// WITHOUT LIMITATION, ALL WARRANTIES AND CONDITIONS OF MERCHANTABILITY, -// TITLE, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, +// +// *ALL OTHER WARRANTIES AND CONDITIONS (EXPRESS, IMPLIED OR STATUTORY) +// ARE HEREBY DISCLAIMED, SUCH WARRANTIES AND CONDITIONS INCLUDING +// WITHOUT LIMITATION, ALL WARRANTIES AND CONDITIONS OF MERCHANTABILITY, +// TITLE, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, // COMPATIBILITY, AND SECURITY OR ACCURACY.* -// +// // ============================================================================ // // = LIBRARY @@ -320,7 +320,7 @@ spawn_test(bool ipv6_test) ACE_Thread_Manager::instance ()->wait (); #else /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */ ACE_ERROR ((LM_DEBUG, - ACE_TEXT ("(%P|%t) \n"), + ACE_TEXT ("(%P|%t)\n"), ACE_TEXT ("only one thread may be run ") ACE_TEXT ("in a process on this platform\n"))); #endif /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */ diff --git a/ACE/tests/SString_Test.cpp b/ACE/tests/SString_Test.cpp index f91e2e8e9ed..31eebbc5ad9 100644 --- a/ACE/tests/SString_Test.cpp +++ b/ACE/tests/SString_Test.cpp @@ -92,45 +92,45 @@ run_main (int, ACE_TCHAR *[]) // Not equal comparisons. Error if they are equal if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} - if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Equal comparisons. Error if they are not equal - if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Substring match. Error if they are not equal - if (s1.strstr (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s3.strstr (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1.strstr (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s3.strstr (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Substring creation. Error if they are not equal - if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.substring (4, 10).length () != 1){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.substring (4, 10).length () != 1){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Forward search. Error if they are not equal - if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s3.find (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s3.find (s1, 1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.find (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s3.find (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s3.find (s1, 1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.find (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Reverse search. Error if they are not equal - if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} - if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} + if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} // Assignment. Error if they are not equal ACE_CString s6; s6 = s0; - if (s6 != s0){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s6 != s0){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} s6 = s4; - if (s4 != s6){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s4 != s6){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} s6 = s5; - if (s6 != s5){ACE_ERROR((LM_ERROR,"Set #1: \n"));return 1;} + if (s6 != s5){ACE_ERROR((LM_ERROR,"Set #1:\n"));return 1;} } { @@ -149,59 +149,59 @@ run_main (int, ACE_TCHAR *[]) ACE_CString zero_size_string (s1.c_str (), 0, 0, false); // Not equal comparisons. Error if they are equal - if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Equal comparisons. Error if they are not equal - if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Substring match. Error if they are not equal - if (s1.strstr (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s3.strstr (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1.strstr (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s3.strstr (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Substring creation. Error if they are not equal - if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Forward search. Error if they are not equal - if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s3.find (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s3.find (s1, 1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.find (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s3.find (s1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s3.find (s1, 1) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.find (s2) != ACE_CString::npos){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Reverse search. Error if they are not equal - if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} - if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} + if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Assignment. Error if they are not equal ACE_CString s6; s6 = s0; - if (s6 != s0){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s6 != s0){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} s6 = s4; - if (s4 != s6){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s4 != s6){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} s6 = s5; - if (s6 != s5){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s6 != s5){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Clear. Error if they are not equal s0.clear(); - if (s0.length() != 0){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s0.length() != 0){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} // Rep. Error if they are not equal ACE_Auto_Basic_Array_Ptr<char> s (s1.rep ()); if (ACE_OS::strlen (s.get ()) != s1.length ()) { - ACE_ERROR((LM_ERROR,"Auto_ptr s: \n")); + ACE_ERROR((LM_ERROR,"Auto_ptr s:\n")); }; ACE_CString s7 (s.get ()); - if (s1 != s7){ACE_ERROR((LM_ERROR,"Set #2: \n"));return 1;} + if (s1 != s7){ACE_ERROR((LM_ERROR,"Set #2:\n"));return 1;} } { @@ -221,50 +221,50 @@ run_main (int, ACE_TCHAR *[]) ACE_NS_WString zero_size_string (s1.c_str (), 0, 0); // Not equal comparisons. Error if they are equal - if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1 == s5){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} if (s1 == s6){ACE_ERROR((LM_ERROR,"Set #3: off-by-one failed\n"));return 1;} // Equal comparisons. Error if they are not equal - if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1 != s1){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1 != s0){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Substring match. Error if they are not equal - if (s1.strstr (s2) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s3.strstr (s1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1.strstr (s2) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.strstr (s3) != 2){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s3.strstr (s1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.strstr (s4) != 1){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Substring creation. Error if they are not equal - if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1.substring (0) != s1){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.substring (1) != s4){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.substring (2, 2) != s3){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.substring (0, 0) != empty_string){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Forward search. Error if they are not equal - if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s3.find (s1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s3.find (s1, 1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.find (s2) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1.find (s3) != 2){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s3.find (s1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.find (s3, 2) != 2){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s3.find (s1, 1) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.find (s2) != ACE_NS_WString::npos){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.find ('o') != 4){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Reverse search. Error if they are not equal - if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} - if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s1.rfind ('l') != 3){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} + if (s1.rfind ('l', 3) != 2){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Assignment. Error if they are not equal ACE_NS_WString s7; s7 = s0; - if (s7 != s0){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s7 != s0){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} s7 = s4; - if (s4 != s7){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s4 != s7){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} s7 = s5; - if (s7 != s5){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s7 != s5){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} // Clear. Error if they are not equal s0.clear(); - if (s0.length() != 0){ACE_ERROR((LM_ERROR,"Set #3: \n"));return 1;} + if (s0.length() != 0){ACE_ERROR((LM_ERROR,"Set #3:\n"));return 1;} } { @@ -272,44 +272,44 @@ run_main (int, ACE_TCHAR *[]) ACE_CString s1("dog"); ACE_CString s2("d"); - if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if (!(s1 > s2)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if (s1 < s2){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if (s1 == s2){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if (!(s1 > s2)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if (s1 < s2){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} ACE_CString s3 ("dog"); ACE_CString s4 ("dogbert"); - if (s3 == s4){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if (!(s3 < s4)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if (s3 > s4){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if (s3 == s4){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if (!(s3 < s4)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if (s3 > s4){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} ACE_CString s5 ("dogbert",3); ACE_CString s6 ("dogbert",5); - if(s5 == s6){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(!(s5 < s6)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(s5 > s6){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if(s5 == s6){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(!(s5 < s6)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(s5 > s6){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} ACE_CString s7 ("dogbert",4); ACE_CString s8 ("dogbert",2); - if(s7 == s8){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(!(s7 > s8)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(s7 < s8){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if(s7 == s8){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(!(s7 > s8)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(s7 < s8){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} ACE_CString s9 ("dogbert",3); ACE_CString s10 ("dogbert"); - if(s9 == s10){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(!(s9 < s10)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(s9 > s10){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if(s9 == s10){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(!(s9 < s10)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(s9 > s10){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} ACE_CString s11 ("dogbert",5); ACE_CString s12 ("dog"); - if(s11 == s12){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(!(s11 > s12)){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} - if(s11 < s12){ACE_ERROR((LM_ERROR,"Set #4: \n"));return 1;} + if(s11 == s12){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(!(s11 > s12)){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} + if(s11 < s12){ACE_ERROR((LM_ERROR,"Set #4:\n"));return 1;} s11.fast_clear (); if (s11.length () != 0) @@ -329,7 +329,7 @@ run_main (int, ACE_TCHAR *[]) sstr.substring (2, 300); if (tmp.length () == 300) - ACE_ERROR ((LM_ERROR, "SString substring \n")); + ACE_ERROR ((LM_ERROR, "SString substring\n")); // Constring an ACE_SString without a character pointer or from an // existing ACE_SString causes memory to be allocated that will not diff --git a/ACE/tests/Signal_Test.cpp b/ACE/tests/Signal_Test.cpp index 26a10e2ef0a..74251025f0a 100644 --- a/ACE/tests/Signal_Test.cpp +++ b/ACE/tests/Signal_Test.cpp @@ -97,7 +97,7 @@ handle_signal (int signum) #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) killing child pid %d \n"), + ACE_TEXT ("(%P|%t) killing child pid %d\n"), child_pid)); #endif int const result = ACE_OS::kill (child_pid, diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index cb61cf32283..a2cbb5569d7 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -163,7 +163,7 @@ int Request_Handler::resume_handler (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) resume_handler () called \n"))); + ACE_TEXT ("(%t) resume_handler () called\n"))); return 1; } diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index 7f005517c77..9c8279fbc5b 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -299,9 +299,9 @@ Time_Calculation ::print_stats (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") - ACE_TEXT ("\treal_time\t = %0.06f ms, \n") - ACE_TEXT ("\tuser_time\t = %0.06f ms, \n") - ACE_TEXT ("\tsystem_time\t = %0.06f ms, \n") + ACE_TEXT ("\treal_time\t = %0.06f ms,\n") + ACE_TEXT ("\tuser_time\t = %0.06f ms,\n") + ACE_TEXT ("\tsystem_time\t = %0.06f ms,\n") ACE_TEXT ("\t%0.00f calls/second\n"), elapsed_time.real_time < 0.0 ? 0.0 : elapsed_time.real_time, elapsed_time.user_time < 0.0 ? 0.0 : elapsed_time.user_time, @@ -438,7 +438,7 @@ run_main (int argc, ACE_TCHAR *argv[]) if (not_upgraded != 0 || upgraded != 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("upgraded to not upgraded ratio = %f \n"), + ACE_TEXT ("upgraded to not upgraded ratio = %f\n"), (float) upgraded / (float) (not_upgraded + upgraded))); ACE_DEBUG ((LM_DEBUG, |