diff options
Diffstat (limited to 'ACE')
148 files changed, 566 insertions, 566 deletions
diff --git a/ACE/ACEXML/common/Transcode.cpp b/ACE/ACEXML/common/Transcode.cpp index 5cad39f48d5..cdf89019a62 100644 --- a/ACE/ACEXML/common/Transcode.cpp +++ b/ACE/ACEXML/common/Transcode.cpp @@ -233,7 +233,7 @@ ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src, { return ACEXML_END_OF_SOURCE; } - + return ACEXML_Transcoder::surrogate2ucs4 (*src, *(src+1), dst); @@ -244,7 +244,7 @@ ACEXML_Transcoder::utf162ucs4 (const ACEXML_UTF16 *src, { return ACEXML_END_OF_SOURCE; } - + dst = *src; } diff --git a/ACE/ASNMP/tests/run_tests.sh b/ACE/ASNMP/tests/run_tests.sh index c8d911c184c..19a1ca957f7 100755 --- a/ACE/ASNMP/tests/run_tests.sh +++ b/ACE/ASNMP/tests/run_tests.sh @@ -1,8 +1,8 @@ #!/bin/sh # This is the UNIX version of the one-button ACE tests. # Contributed by Michael Rueger <m_rueger@SYSCOMP.DE> -# mrm@cisco.com - Change to for loop script could be more generic if we put -# this in the bin dir and fed it a file to read from +# mrm@cisco.com - Change to for loop script could be more generic if we put +# this in the bin dir and fed it a file to read from IFS="|" tmp=/tmp diff --git a/ACE/Kokyu/Dispatcher_Task.inl b/ACE/Kokyu/Dispatcher_Task.inl index e663509d86b..84ff1ee6017 100644 --- a/ACE/Kokyu/Dispatcher_Task.inl +++ b/ACE/Kokyu/Dispatcher_Task.inl @@ -52,8 +52,8 @@ Dispatch_Queue_Item::Dispatch_Queue_Item ( ACE_Data_Block *data_block, int flags, ACE_Allocator* mb_allocator) - : ACE_Message_Block (data_block, - flags, + : ACE_Message_Block (data_block, + flags, mb_allocator), command_ (cmd), qos_info_ (qos_info) diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 033cef78f55..c114deb90ee 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -272,7 +272,7 @@ ACE::strdelete (wchar_t *s) ACE_INLINE bool ACE::isdotdir (const char *s) { - return (s[0] == '.' && + return (s[0] == '.' && ((s[1] == 0) || (s[1] == '.' && s[2] == 0))); } @@ -280,7 +280,7 @@ ACE::isdotdir (const char *s) ACE_INLINE bool ACE::isdotdir (const wchar_t *s) { - return (s[0] == ACE_TEXT ('.') && + return (s[0] == ACE_TEXT ('.') && ((s[1] == 0) || (s[1] == ACE_TEXT ('.') && s[2] == 0))); } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index e2f3e8a1cf7..6302b18e13a 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -13,7 +13,7 @@ #if defined (ACE_HAS_SOLARIS_ATOMIC_LIB) # include <atomic.h> -#endif +#endif ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/CDR_Size.cpp b/ACE/ace/CDR_Size.cpp index 45fea6a0687..6573825bd5e 100644 --- a/ACE/ace/CDR_Size.cpp +++ b/ACE/ace/CDR_Size.cpp @@ -21,13 +21,13 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) errno = EACCES; return (this->good_bit_ = false); } - + if (static_cast<ACE_CDR::Short> (major_version_) == 1 && static_cast<ACE_CDR::Short> (minor_version_) == 2) { ACE_CDR::Octet len = static_cast<ACE_CDR::Octet> (ACE_OutputCDR::wchar_maxbytes ()); - + if (this->write_1 (&len)) { if (ACE_OutputCDR::wchar_maxbytes () == sizeof(ACE_CDR::WChar)) @@ -63,7 +63,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) errno = EINVAL; return (this->good_bit_ = false); } - + if (ACE_OutputCDR::wchar_maxbytes () == sizeof (ACE_CDR::WChar)) { const void *temp = &x; @@ -74,7 +74,7 @@ ACE_SizeCDR::write_wchar (ACE_CDR::WChar x) ACE_CDR::Short sx = static_cast<ACE_CDR::Short> (x); return this->write_2 (reinterpret_cast<const ACE_CDR::UShort *> (&sx)); } - + ACE_CDR::Octet ox = static_cast<ACE_CDR::Octet> (x); return this->write_1 (reinterpret_cast<const ACE_CDR::Octet *> (&ox)); } @@ -136,9 +136,9 @@ ACE_SizeCDR::write_wstring (ACE_CDR::ULong len, this->write_ulong ( ACE_Utils::truncate_cast<ACE_CDR::ULong> ( ACE_OutputCDR::wchar_maxbytes () * len)); - + if (good_ulong) - { + { return this->write_wchar_array (x, len); } } diff --git a/ACE/ace/Codecs.cpp b/ACE/ace/Codecs.cpp index 0a5ff506776..19718c03aff 100644 --- a/ACE/ace/Codecs.cpp +++ b/ACE/ace/Codecs.cpp @@ -69,7 +69,7 @@ ACE_Base64::encode (const ACE_Byte* input, result[pos++] = alphabet[bits & 0x3f]; cols += 4; if (cols == max_columns) { - if (is_chunked) + if (is_chunked) result[pos++] = '\n'; cols = 0; } diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp index 4d3ba9996c2..fa4bda1d03b 100644 --- a/ACE/ace/Dynamic_Service_Base.cpp +++ b/ACE/ace/Dynamic_Service_Base.cpp @@ -86,7 +86,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") ACE_TEXT (" type=%@ => %@") ACE_TEXT (" [in repo=%@]\n"), - repo->repo_, name, type, obj, + repo->repo_, name, type, obj, repo_found->repo_)); } else diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index 7ab1e930aa2..addf5e55795 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -359,7 +359,7 @@ ETCL_Literal_Constraint::operator/ (const ETCL_Literal_Constraint & rhs) { if ((ACE_CDR::Double) rhs == 0.0) return ETCL_Literal_Constraint ((ACE_CDR::Double) 0.0); - + ACE_CDR::Double result = (ACE_CDR::Double) *this / (ACE_CDR::Double) rhs; return ETCL_Literal_Constraint ((ACE_CDR::Double) result); } diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl index e01cf43da40..3b6ac8d730c 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.inl +++ b/ACE/ace/ETCL/ETCL_Constraint.inl @@ -72,7 +72,7 @@ ETCL_Union_Value::string (void) const ACE_INLINE ETCL_Union_Pos::ETCL_Union_Pos (void) {} - + ACE_INLINE ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value, ETCL_Constraint *component) @@ -81,7 +81,7 @@ ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value, this->union_value_ = dynamic_cast<ETCL_Union_Value*> (union_value); } - + ACE_INLINE ETCL_Union_Value * ETCL_Union_Pos::union_value (void) const { diff --git a/ACE/ace/ETCL/ETCL_Interpreter.cpp b/ACE/ace/ETCL/ETCL_Interpreter.cpp index 5d7cbcfbc58..3c3e4405d07 100644 --- a/ACE/ace/ETCL/ETCL_Interpreter.cpp +++ b/ACE/ace/ETCL/ETCL_Interpreter.cpp @@ -81,13 +81,13 @@ char* Lex_String_Input::end_ = 0; // Routine to have Lex read its input from the constraint string. int -Lex_String_Input::copy_into (char* buf, +Lex_String_Input::copy_into (char* buf, int max_size) { - int const chars_left = + int const chars_left = ACE_Utils::truncate_cast<int> ( Lex_String_Input::end_ - Lex_String_Input::current_); - + int const n = max_size > chars_left ? chars_left : max_size; if (n > 0) @@ -106,7 +106,7 @@ Lex_String_Input::reset (char* input_string) { Lex_String_Input::string_ = input_string; Lex_String_Input::current_ = input_string; - Lex_String_Input::end_ = + Lex_String_Input::end_ = input_string + ACE_OS::strlen (Lex_String_Input::string_); } diff --git a/ACE/ace/FIFO_Recv_Msg.inl b/ACE/ace/FIFO_Recv_Msg.inl index 13b0f05ac94..4a7ce576e38 100644 --- a/ACE/ace/FIFO_Recv_Msg.inl +++ b/ACE/ace/FIFO_Recv_Msg.inl @@ -43,12 +43,12 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) ssize_t recv_len = ACE_OS::read (this->get_handle (), (char *) recv_msg.buf, ACE_MIN (remaining, requested)); - + if (recv_len == -1) { return -1; } - + // Tell caller what's really in the buffer. recv_msg.len = static_cast<int> (recv_len); @@ -60,7 +60,7 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) // saving the indication here either to read the remainder later. size_t total_msg_size = remaining; remaining -= recv_len; - + while (remaining > 0) { const size_t throw_away = 1024; @@ -68,15 +68,15 @@ ACE_FIFO_Recv_Msg::recv (ACE_Str_Buf &recv_msg) recv_len = ACE_OS::read (this->get_handle (), dev_null, ACE_MIN (remaining, throw_away)); - + if (recv_len == -1) { break; } - + remaining -= recv_len; } - + return ACE_Utils::truncate_cast<ssize_t> (total_msg_size); } #endif /* ACE_HAS_STREAM_PIPES */ @@ -118,7 +118,7 @@ ACE_FIFO_Recv_Msg::recv (int *band, int *flags) { ACE_TRACE ("ACE_FIFO_Recv_Msg::recv"); - + if (ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, diff --git a/ACE/ace/MEM_IO.inl b/ACE/ace/MEM_IO.inl index 341305c3fd9..0abaf6d4af4 100644 --- a/ACE/ace/MEM_IO.inl +++ b/ACE/ace/MEM_IO.inl @@ -129,7 +129,7 @@ ACE_MEM_IO::send (const void *buf, const ACE_Time_Value *timeout) { ACE_TRACE ("ACE_MEM_IO::send"); - + if (this->deliver_strategy_ == 0) { return 0; @@ -138,12 +138,12 @@ ACE_MEM_IO::send (const void *buf, ACE_MEM_SAP_Node *sbuf = this->deliver_strategy_->acquire_buffer ( ACE_Utils::truncate_cast<ssize_t> (len)); - + if (sbuf == 0) { return -1; // Memory buffer not initialized. } - + ACE_OS::memcpy (sbuf->data (), buf, len); /// @@ -166,17 +166,17 @@ ACE_MEM_IO::recv (void *buf, size_t count = 0; size_t buf_len = this->buf_size_ - this->cur_offset_; - + if (buf_len == 0) { ssize_t blen = // Buffer length this->fetch_recv_buf (flags, timeout); - + if (blen <= 0) { return blen; } - + buf_len = this->buf_size_; } diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp index b76bb07aea4..d79247a4466 100644 --- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp @@ -53,16 +53,16 @@ namespace ACE { ACE_UINT64 count = 0; int fd = socket (AF_INET, SOCK_DGRAM, 0); - - if (fd == -1) + + if (fd == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n"))); return; } struct ifaddrs *ifa, *ifap; - - if (getifaddrs (&ifap) < 0) + + if (getifaddrs (&ifap) < 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n"))); close (fd); @@ -70,15 +70,15 @@ namespace ACE } char *p = 0; - - for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) + + for (ifa = ifap; ifa != 0; ifa = ifa->ifa_next) { if (p && strcmp (p, ifa->ifa_name) == 0) { continue; } - - p = ifa->ifa_name; + + p = ifa->ifa_name; #if defined (__OpenBSD__) struct ifreq ifdr; @@ -94,7 +94,7 @@ namespace ACE #else strncpy (ifdr.ifdr_name, ifa->ifa_name, sizeof (ifdr)); #endif - if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1) + if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n"))); } @@ -125,7 +125,7 @@ namespace ACE freeifaddrs (ifap); close (fd); - + value = count; } } diff --git a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp index 3838610b5a1..7950244762c 100644 --- a/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Received_Monitor.cpp @@ -35,7 +35,7 @@ namespace ACE Bytes_Received_Monitor::update (void) { this->update_i (); - + /// On some platforms, value_ is an ACE_UINT64. this->receive (static_cast<double> (this->value_)); } @@ -45,7 +45,7 @@ namespace ACE { return Bytes_Received_Monitor::default_name_; } - + void Bytes_Received_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp index 4f2ecf47d31..e4aa4f2af59 100644 --- a/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Bytes_Sent_Monitor.cpp @@ -26,7 +26,7 @@ namespace ACE , Solaris_Network_Interface_Monitor (ACE_TEXT ("obytes")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("obytes")) -#elif defined (__NetBSD__) || defined (__OpenBSD__) +#elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("obytes")) #endif {} @@ -35,7 +35,7 @@ namespace ACE Bytes_Sent_Monitor::update (void) { this->update_i (); - + /// On some platforms, value_ is an ACE_UINT64. this->receive (static_cast<double> (this->value_)); } @@ -45,7 +45,7 @@ namespace ACE { return Bytes_Sent_Monitor::default_name_; } - + void Bytes_Sent_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp index afede0fc5fb..047062bf6fd 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp @@ -85,7 +85,7 @@ namespace ACE { return CPU_Load_Monitor::default_name_; } - + void CPU_Load_Monitor::clear_i (void) { @@ -96,7 +96,7 @@ namespace ACE this->init (); this->Monitor_Base::clear_i (); } - + void CPU_Load_Monitor::init (void) { diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp index ddaf2cbc91d..9cbc0c15d66 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp @@ -70,7 +70,7 @@ namespace ACE { this->init (); } - + void Linux_Network_Interface_Monitor::init (void) { diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp index 1647430c90c..179c6c144ef 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp @@ -60,7 +60,7 @@ namespace ACE { return Memory_Usage_Monitor::default_name_; } - + void Memory_Usage_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/Monitor_Group.cpp b/ACE/ace/Monitor_Control/Monitor_Group.cpp index c5329a4d1dc..dd40cacf478 100644 --- a/ACE/ace/Monitor_Control/Monitor_Group.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Group.cpp @@ -36,19 +36,19 @@ namespace ACE { /// No-op, should always call update(). } - + void Monitor_Group::receive (size_t /* data */) { /// No-op, should always call update(). } - + void Monitor_Group::receive (const Monitor_Control_Types::NameList& /* data */) { /// No-op, should always call update(). } - + void Monitor_Group::clear (void) { diff --git a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp index 318afcfc026..bcbd73329cc 100644 --- a/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp @@ -18,7 +18,7 @@ namespace ACE { /// No-op. } - + void Null_Network_Interface_Monitor::clear_impl (void) { diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp index 8aba3d75ccf..b082dfe759e 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp @@ -78,7 +78,7 @@ namespace ACE { return Num_Threads_Monitor::default_name_; } - + void Num_Threads_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp index b8ba8fbc8b8..19314fb58cd 100644 --- a/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Received_Monitor.cpp @@ -26,7 +26,7 @@ namespace ACE , Solaris_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #elif defined (__FreeBSD__) || defined (__Lynx__) , FreeBSD_Network_Interface_Monitor (ACE_TEXT ("ipackets")) -#elif defined (__NetBSD__) || defined (__OpenBSD__) +#elif defined (__NetBSD__) || defined (__OpenBSD__) , BSD_Network_Interface_Monitor (ACE_TEXT ("ipackets")) #endif {} @@ -35,7 +35,7 @@ namespace ACE Packets_Received_Monitor::update (void) { this->update_i (); - + /// On some platforms, value_ is an ACE_UINT64. this->receive (static_cast<double> (this->value_)); } @@ -45,7 +45,7 @@ namespace ACE { return Packets_Received_Monitor::default_name_; } - + void Packets_Received_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp index 13b3725af6d..6792b94b950 100644 --- a/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Packets_Sent_Monitor.cpp @@ -35,7 +35,7 @@ namespace ACE Packets_Sent_Monitor::update (void) { this->update_i (); - + /// On some platforms, value_ is an ACE_UINT64. this->receive (static_cast<double> (this->value_)); } @@ -45,7 +45,7 @@ namespace ACE { return Packets_Sent_Monitor::default_name_; } - + void Packets_Sent_Monitor::clear_i (void) { diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp index 8e41a7b4f2c..86170fd6c6d 100644 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp @@ -28,18 +28,18 @@ namespace ACE this->access_kstats (this->value_); this->value_ -= this->start_; } - + void Solaris_Network_Interface_Monitor::clear_impl (void) { this->init (); } - + void Solaris_Network_Interface_Monitor::init (void) { unsigned long i; - + for (i = 0UL; i < MAX_LO_INTERFACES; ++i) { this->value_array_lo_[i] = 0UL; @@ -52,7 +52,7 @@ namespace ACE this->access_kstats (this->start_); } - + void Solaris_Network_Interface_Monitor::access_kstats ( ACE_UINT64 &which_member) @@ -80,24 +80,24 @@ namespace ACE { continue; } - + unsigned long ks_instance = this->kstat_->ks_instance; - + if (ACE_OS::strcmp (this->kstat_->ks_module, "lo") == 0) { /// Interfaces 'lo' have only packet counters. - if (this->lookup_str_ == ACE_TEXT ("obytes") + if (this->lookup_str_ == ACE_TEXT ("obytes") || this->lookup_str_ == ACE_TEXT ("rbytes")) { continue; } - + status = this->check_ks_module (ks_instance, MAX_LO_INTERFACES, "MAX_LO_INTERFACES", this->value_array_lo_, which_member); - + if (status == -1) { /// Unrecoverable error, diagnostic already output. @@ -108,7 +108,7 @@ namespace ACE { /// The kstat_id changed underneath us, start over. break; - } + } } else if (ACE_OS::strcmp (this->kstat_->ks_module, "hme") == 0 || ACE_OS::strcmp (this->kstat_->ks_module, "bge") == 0) @@ -118,7 +118,7 @@ namespace ACE "MAX_HME_INTERFACES", this->value_array_hme_, which_member); - + if (status == -1) { /// Unrecoverable error, diagnostic already output. @@ -132,11 +132,11 @@ namespace ACE } } } - + if (this->kstat_) { this->kstat_id_ = kstat_chain_update (this->kstats_); - + if (! this->kstat_id_ > 0) { ACE_ERROR ((LM_ERROR, "kstat is is not > 0.\n")); @@ -148,7 +148,7 @@ namespace ACE break; } } - + status = kstat_close (this->kstats_); if (status != 0) @@ -157,7 +157,7 @@ namespace ACE ACE_TEXT ("closing kstats file failed\n"))); } } - + int Solaris_Network_Interface_Monitor::check_ks_module ( const unsigned long ks_instance, @@ -187,30 +187,30 @@ namespace ACE /// This return value restarts the walk as described above. return 1; } - + kstat_named_t *value = (kstat_named_t *) kstat_data_lookup ( this->kstat_, ACE_TEXT_ALWAYS_CHAR (this->lookup_str_.rep ())); - + if (value == 0) { /// Just return and let the calling FOR loop advance. return 0; } - + if (value->data_type != KSTAT_DATA_UINT32) { ACE_ERROR_RETURN ((LM_ERROR, "Wrong data type.\n"), -1); } - - /// Guard against overflow. + + /// Guard against overflow. value_array[ks_instance] += value->value.ui32 - static_cast<ACE_UINT32> (value_array[ks_instance]); - + which_member += value_array[ks_instance]; return 0; diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp index b111b511598..4177eb87ed7 100644 --- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp @@ -21,27 +21,27 @@ namespace ACE { this->init (); } - + void Windows_Monitor::update_i (void) { PdhCollectQueryData (this->query_); PDH_FMT_COUNTERVALUE pdh_value; - + PdhGetFormattedCounterValue (this->counter_, PDH_FMT_DOUBLE, 0, &pdh_value); - + this->value_ = pdh_value.doubleValue; } - + void Windows_Monitor::clear_impl (void) { this->init (); } - + void Windows_Monitor::init (void) { diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp index f674078b69a..7bd77a67637 100644 --- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp @@ -88,7 +88,7 @@ namespace ACE this->value_ += (*current_instance)->value_; } } - + void Windows_Multi_Instance_Monitor::clear_impl (void) { diff --git a/ACE/ace/Monitor_Point_Registry.cpp b/ACE/ace/Monitor_Point_Registry.cpp index 03ea39be4ba..a451484b846 100644 --- a/ACE/ace/Monitor_Point_Registry.cpp +++ b/ACE/ace/Monitor_Point_Registry.cpp @@ -42,7 +42,7 @@ namespace ACE type->add_ref (); status = this->map_.bind (type->name (), type); - + /// Temporary debugging code. // ACE_DEBUG ((LM_DEBUG, "adding %s\n", type->name ())); } @@ -75,7 +75,7 @@ namespace ACE ACE_CString name_str (name, 0, false); status = this->map_.unbind (name_str, mp); - + /// Temporary debugging code. // ACE_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ())); } diff --git a/ACE/ace/QoS/QoS_Session_Impl.inl b/ACE/ace/QoS/QoS_Session_Impl.inl index b3971b46d52..c5aa3a1e9f9 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.inl +++ b/ACE/ace/QoS/QoS_Session_Impl.inl @@ -100,13 +100,13 @@ ACE_RAPI_Session::source_port (const u_short &source_port) this->source_port_ = source_port; } -ACE_INLINE ACE_INET_Addr* +ACE_INLINE ACE_INET_Addr* ACE_RAPI_Session::source_addr (void) const { return this->src_addr_; } - -ACE_INLINE void + +ACE_INLINE void ACE_RAPI_Session::source_addr (ACE_INET_Addr* source_addr) { this->src_addr_ = source_addr; @@ -207,13 +207,13 @@ ACE_GQoS_Session::source_port (const u_short &source_port) this->source_port_ = source_port; } -ACE_INLINE ACE_INET_Addr* +ACE_INLINE ACE_INET_Addr* ACE_GQoS_Session::source_addr (void) const { return this->src_addr_; } - -ACE_INLINE void + +ACE_INLINE void ACE_GQoS_Session::source_addr (ACE_INET_Addr* source_addr) { this->src_addr_ = source_addr; diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp index 8e3992aad06..8b462fc1e7b 100644 --- a/ACE/ace/RB_Tree.cpp +++ b/ACE/ace/RB_Tree.cpp @@ -1076,7 +1076,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node< y->color (z->color ()); z->color (yColor); - //Reassign the y pointer to z because the node that y points to will be + //Reassign the y pointer to z because the node that y points to will be //deleted y = z; } diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index 7b348ffa120..3612e1cfbce 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -502,7 +502,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) return -1; } } - return 1; + return 1; } if (this->flags_ & SF_REQ_SHUTDOWN) diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index 91eb7d08bd9..5460e1c8a6b 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -71,7 +71,7 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, ACE_Countdown_Time countdown ((timeout == 0 ? 0 : &t)); int status; - + do { // These handle sets are used to set up for whatever SSL_connect @@ -138,7 +138,7 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, { status = -1; } - + break; default: diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index 5703553bcba..b31f910dc6a 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -50,7 +50,7 @@ ACE_Service_Config::open (int argc, ignore_default_svc_conf, ignore_debug_flag) == -1) return -1; - + return current()->open (argc, argv, logger_key, diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 899a55330b4..f3799df33d5 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -1059,7 +1059,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], if (!ignore_default_svc_conf_file) { bool add_default = true; - bool has_files = this->svc_conf_file_queue_ && + bool has_files = this->svc_conf_file_queue_ && !this->svc_conf_file_queue_->is_empty (); bool has_cmdline = this->svc_queue_ && !this->svc_queue_->is_empty (); if (has_files || has_cmdline) diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp index 7f9e93f0608..9caa72fcb98 100644 --- a/ACE/ace/Service_Types.cpp +++ b/ACE/ace/Service_Types.cpp @@ -375,7 +375,7 @@ ACE_Stream_Type::fini (void) const // Final arg is an indication to *not* delete the Module. str->remove (m->name (), - MT_Module::M_DELETE_NONE); + MT_Module::M_DELETE_NONE); m = t; } str->close (); diff --git a/ACE/ace/Thread_Mutex.inl b/ACE/ace/Thread_Mutex.inl index 0a9abbd3b9e..5eba0696c4b 100644 --- a/ACE/ace/Thread_Mutex.inl +++ b/ACE/ace/Thread_Mutex.inl @@ -12,7 +12,7 @@ ACE_Thread_Mutex::lock (void) const } ACE_INLINE ACE_thread_mutex_t & -ACE_Thread_Mutex::lock (void) +ACE_Thread_Mutex::lock (void) { // ACE_TRACE ("ACE_Thread_Mutex::lock"); return this->lock_; diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp index d913a92049b..5bb51295701 100644 --- a/ACE/ace/Tokenizer_T.cpp +++ b/ACE/ace/Tokenizer_T.cpp @@ -124,7 +124,7 @@ ACE_Tokenizer_T<ACE_CHAR_T>::next (void) index_ = 0; return 0; } - + // Check if a buffer has been passed if (!buffer_) { diff --git a/ACE/ace/Unbounded_Set.inl b/ACE/ace/Unbounded_Set.inl index 0f2847e9cc3..a7266f2802d 100644 --- a/ACE/ace/Unbounded_Set.inl +++ b/ACE/ace/Unbounded_Set.inl @@ -13,7 +13,7 @@ ACE_Unbounded_Set_Default_Comparator<T>::operator () (const T &lhs, const T &rh } template<typename T> -ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, +ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, bool end) : base_type (s, end) { diff --git a/ACE/ace/Vector_T.cpp b/ACE/ace/Vector_T.cpp index d66abd411ac..c3aa5988b07 100644 --- a/ACE/ace/Vector_T.cpp +++ b/ACE/ace/Vector_T.cpp @@ -40,7 +40,7 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem) } else ACE_Array<T>::size (length_ + 1); - + ++length_; (*this)[length_-1] = elem; } diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index fd56654ea99..07b90eeb92e 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -359,7 +359,7 @@ ACE_XtReactor::compute_Xt_condition(ACE_HANDLE handle) if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK)) ACE_SET_BITS (condition, XtInputWriteWinsock); // EXCEPT_MASK is not supported for WIN32. As this was - // already handled in register_handler_i, no check here. + // already handled in register_handler_i, no check here. #endif /* !ACE_WIN32 */ return condition; diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl index 9e52c1dec97..098f07f48d3 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-common.pl @@ -35,7 +35,7 @@ sub html_begin { <IMG SRC="$wd/doc/webstone.gif" ALT="WebStone" BORDER=0 ></A> <H1>World Wide Web Server Benchmarking</H1> <DL> -<DT><EM>If you have any questions, please read the +<DT><EM>If you have any questions, please read the <A HREF="$wd/doc/FAQ-webstone.html">WebStone FAQ</A>.</EM> <HR> EOF diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl index f47ac6a8f06..5588f6cdd1f 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/WebStone-setup.pl @@ -58,7 +58,7 @@ sub gettestbed { } else { ( $textvalue, $thevalue ) = split( '=', $_ ); - ( $thevalue ) = split( '#', $thevalue); + ( $thevalue ) = split( '#', $thevalue); $testbed{$textvalue} = $thevalue; push(@keylist, $textvalue); } diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl index af2c470fb0c..c1bdb727fba 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/mine-logs.pl @@ -12,10 +12,10 @@ # # 1. For each line in the input # a. parse the URL and the time, the outcome code, and the size -# b. if the code is 200, and it's a GET, +# b. if the code is 200, and it's a GET, # do we already know about this URL? # i. yes - increment its counter -# ii. no - create a slot for it, record size, +# ii. no - create a slot for it, record size, # and set counter=1 # @@ -28,7 +28,7 @@ while (<>) { $line_number++; ($line_number % 1000) || printf STDERR "."; # parse line - ( $client, $junk1, $junk2, $date, $timezone, + ( $client, $junk1, $junk2, $date, $timezone, $command, $url, $version, $result_code, $size ) = split; # strip some junk @@ -81,7 +81,7 @@ foreach $key (@sorted_keys) { # end main -sub +sub by_counter { $counter{$b} <=> $counter{$a}; } diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl index cb0c7224c09..9f5515baa55 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/webstone-gui.pl @@ -99,7 +99,7 @@ sub start_html_server { sub process_html_request { local($request, $command, $script, $magic, $url, $peer); local(%args); - + # # Parse the command and URL. Update the default file prefix. # @@ -109,12 +109,12 @@ sub process_html_request { if ($command eq "" || $command eq "QUIT") { return; } - + #($junk, $script) = split(/\//, $url, 2); #($script, $html_script_args) = split(',', $script, 2); #($HTML_CWD = "file:$script") =~ s/\/[^\/]*$//; $script = $url; - + while (<CLIENT>) { last if (/^\s+$/); } @@ -130,7 +130,7 @@ sub process_html_request { get_file($script); } } elsif ($command eq "POST") { - + print $request if $debug; flush; # @@ -148,20 +148,20 @@ sub process_html_request { $html_post_attributes .= (/%([0-9][0-9A-Z])/) ? pack('c',hex($1)) : $_; } - %args = ('_junk_', split(/\n([^=]+)=/, $html_post_attributes)); + %args = ('_junk_', split(/\n([^=]+)=/, $html_post_attributes)); delete $args{'_junk_'}; for (keys %args) { print "\$$_ = $args{$_}\n" if $debug; ${$_} = $args{$_}; } perl_html_script($script); - } else { + } else { &bad_html_form($script); } } else { &bad_html_command($request); } -} +} # @@ -169,7 +169,7 @@ sub process_html_request { # sub bad_html_command { local($request) = @_; - + print CLIENT <<EOF <HTML> <HEAD> @@ -184,13 +184,13 @@ The command <TT>$request<TT> was not recognized. EOF ; } - + # # Execute PERL script # sub perl_html_script { local($script) = @_; - + if (! -e $script) { print CLIENT <<EOF <HTML> @@ -229,7 +229,7 @@ EOF # sub bad_html_form { local($script) = @_; - + print CLIENT <<EOF <HTML> <HEAD> @@ -238,14 +238,14 @@ sub bad_html_form { </HEAD> <BODY> <H1>No attribute list</H1> - + No attribute list was found. </BODY> </HTML> EOF ; } - + # # Give them something to read while the server is initializing. # @@ -286,7 +286,7 @@ EOF open(FILE, $file); while (<FILE>) { print CLIENT $_; - } + } close(FILE); print CLIENT <<EOF diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl index f16d626f2ad..c6fc280b023 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/write-testbed.pl @@ -28,12 +28,12 @@ html_end(); # end main sub write_data { - rename("$wd/conf/testbed", "$wd/conf/testbed.bak") || + rename("$wd/conf/testbed", "$wd/conf/testbed.bak") || die "rename testbed: $!\n"; open(TESTBED, ">>$wd/conf/testbed") || die "open testbed: $!\n"; - + print CLIENT "<PRE>"; - + foreach $key (@keylist) { $$key =~ s/\+/ /g; $newvalue = "$key=\"$$key\"\n"; diff --git a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl index 13511bdbb53..27ef003655f 100755 --- a/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl +++ b/ACE/apps/JAWS/clients/WebSTONE/bin/wscollect.pl @@ -15,7 +15,7 @@ require "find.pl"; # the list @runs contains the timestamps for the runs which are found # during the traversal of the runs directory. This list is used for # indices into the associative arrays for storing run information. -# +# # $numclients{ $time } - number of clients for the run # $connrate{ $time } - connection rate average # $littlesload{ $time } - little's load factor @@ -83,7 +83,7 @@ sub wanted { (( $connrate{ $runtime }) = $data =~ /([\d\.]+)/, next); $tag =~ /Server thruput/ && (( $throughput{ $runtime }) = $data =~ /([\d\.]+)/, next); - $tag =~ /Little's Load/ && + $tag =~ /Little's Load/ && (( $littlesload{ $runtime}) = $data =~ /([\d\.]+)/, next); # ' $tag =~ /Average response time/ && (( $latency{ $runtime } ) = $data =~ /([\d\.]+)/, next); @@ -97,7 +97,7 @@ sub wanted { sub printdata { - local ($timestamp, $num_clients, $conn_rate, + local ($timestamp, $num_clients, $conn_rate, $load, $latency, $error, $tput) = @_; format STDOUT = @<<<<<<<<<<< @###### @######.## @####.## @###.#### @####.#### @######.## @@ -106,7 +106,7 @@ $timestamp, $num_clients, $conn_rate, $load, $latency, $error, $tput if (!$printedTitles) { $printedTitles = 1; - ($ttimestamp, $tnum_clients, $tconn_rate, + ($ttimestamp, $tnum_clients, $tconn_rate, $tload, $tlatency, $terror, $ttput) = @title; format STDOUT_TOP = ^||||||||||| ^||||||| ^||||||||| ^||||||| ^||||||||| ^||||||||| ^||||||||||| @@ -119,7 +119,7 @@ $ttimestamp, $tnum_clients, $tconn_rate, $tload, $tlatency, $terror, $ttput $ttimestamp, $tnum_clients, $tconn_rate, $tload, $tlatency, $terror, $ttput ^||||||||||| ^||||||| ^||||||||| ^||||||| ^||||||||| ^||||||||| ^||||||||||| $ttimestamp, $tnum_clients, $tconn_rate, $tload, $tlatency, $terror, $ttput ----------------------------------------------------------------------------- +---------------------------------------------------------------------------- . # write STDOUT_TOP; } # end if printedTitles diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/errexit.c b/ACE/apps/JAWS/clients/WebSTONE/src/errexit.c index 51cccc14805..bdb61dfd4b0 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/errexit.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/errexit.c @@ -84,7 +84,7 @@ va_list args; va_start(args, format); VPRINTF(debugfile, format, args); va_end(args); - + fflush(debugfile); return 0; } @@ -101,6 +101,6 @@ static char buf[200]; sprintf(buf, "errno = %d: %s", errno, strerror(errno)); errno = 0; #endif /* WIN32 */ - + return buf; } diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c b/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c index e6100fc1d0b..2c4858bd642 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c @@ -31,13 +31,13 @@ main(const int argc, char* argv[]) int size; char *cp; - if (argc != 3) + if (argc != 3) { printf("usage: %s file_size_in_bytes[K|M] name\n", argv[0]); exit(2); } - if ((file = fopen(argv[2], "w")) == 0) + if ((file = fopen(argv[2], "w")) == 0) { perror("fopen"); exit(1); @@ -45,9 +45,9 @@ main(const int argc, char* argv[]) size = atoi(argv[1]); - for (cp = argv[1]; *cp; cp++) + for (cp = argv[1]; *cp; cp++) { - switch(*cp) + switch(*cp) { case 'k': case 'K': @@ -60,7 +60,7 @@ main(const int argc, char* argv[]) } } - for (i = 0; i < size; i++) + for (i = 0; i < size; i++) { my_random = ((RANDOM() % 94) + 33); fputc((char)my_random, file); diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/gettimeofday.c b/ACE/apps/JAWS/clients/WebSTONE/src/gettimeofday.c index 1537d7654bd..77ec176169a 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/gettimeofday.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/gettimeofday.c @@ -3,11 +3,11 @@ /* * This file defines functions that are required for unix compatibility. * - * These functions are not available in the Microsoft C/C++ Run Time + * These functions are not available in the Microsoft C/C++ Run Time * and the Win32 API. * * The following functions list may not be complete - * + * * FUNCTIONS: * SHARED _gettimeofday * @@ -34,7 +34,7 @@ int gettimeofday(curTimeP) { struct _timeb localTime; - if (curTimeP == (struct timeval *) 0) + if (curTimeP == (struct timeval *) 0) { errno = EFAULT; return (-1); diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.c b/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.c index c11f5f37733..a963ebab87a 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.c @@ -157,7 +157,7 @@ parse_file_list (const char *url_list_file, page_list_t *page_list, loadnum = 0; if (textvalue != 0) - { + { /* is there more? */ /* check for weighting factor */ D_PRINTF( "Setting page values from: %s\n", textvalue ); diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/rexec.c b/ACE/apps/JAWS/clients/WebSTONE/src/rexec.c index 7ec95e51e8b..38aa2c69d01 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/rexec.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/rexec.c @@ -147,9 +147,9 @@ static void MyOpenService(const char *remote_host) returnerr("Invalid IP address %s\n", remote_host); return; } - + server_addr.sin_addr.S_un.S_addr = addr; - } + } else { struct hostent *hent; diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c b/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c index 3acc9e28b16..6a3cfae2091 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c +++ b/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c @@ -35,7 +35,7 @@ #include <netinet/in.h> #include <netdb.h> #else -#define FD_SETSIZE 1024 /* max size for select() - keep before <winsock.h> +#define FD_SETSIZE 1024 /* max size for select() - keep before <winsock.h> * and same size as MAXCLIENTS */ #include <windows.h> #include <winsock.h> @@ -78,7 +78,7 @@ int num_rexecs = 0; SOCKET socknum[MAXCLIENTS]; SOCKET sockIO[MAXTOTALPROCS]; SOCKET sockErr[MAXTOTALPROCS]; -THREAD FILE *debugfile = stderr; +THREAD FILE *debugfile = stderr; struct hostent *master_phe; /* IP addresses for webmaster */ struct timeval sumedh_start, sumedh_end; @@ -120,16 +120,16 @@ passivesock(const NETPORT portnum, const char *protocol, const int qlen) D_PRINTF( "Beginning passivesock with errno %d\n",errno ); - D_PRINTF( "Zeroing address structure\n" ); + D_PRINTF( "Zeroing address structure\n" ); memset((char *)&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_addr.s_addr = INADDR_ANY; - + /* NOT USED: Map service name to portnumber */ D_PRINTF( "Mapping portnum errno %d\n",errno ); sin.sin_port = htons(portnum); - + /* Map protocol name to number */ D_PRINTF( "Mapping protocol name errno %d\n",errno ); if ((ppe = getprotobyname(protocol)) == 0) @@ -174,11 +174,11 @@ passivesock(const NETPORT portnum, const char *protocol, const int qlen) { errexit("Can't listen on port %s: %s\n", portnum, neterrstr()); } - D_PRINTF( "Listen succeeded\n" ); + D_PRINTF( "Listen succeeded\n" ); /* all done, return socket descriptor */ return(s); -} +} /* abort clients -- called by SIGINT handler */ @@ -239,7 +239,7 @@ void echo_client(void *stream) return; if (rv < 0) errexit("Error in echo_client(): select() returns %d: %s\n", rv, neterrstr()); - + /* loop over the sockets that are ready with data */ for (i = 0; i < num_rexecs; i++) { if (sockarr[i] != BADSOCKET_VALUE && FD_ISSET(sockarr[i], &readfds)) { @@ -253,7 +253,7 @@ void echo_client(void *stream) fprintf(stderr, "Error in echo_client() after NETREAD(): %s\n", neterrstr()); continue; } - + /* copy to stdout or stderr */ fwrite(buf, sizeof(char), len, outfile); } @@ -266,8 +266,8 @@ void echo_client(void *stream) static int echo_client(char *hostname, const int fd) { - /* - * WRITE TEXT FROM FILE DESCRIPTOR INTO STDOUT + /* + * WRITE TEXT FROM FILE DESCRIPTOR INTO STDOUT */ char buf[BUFSIZ]; int cc; @@ -309,7 +309,7 @@ int i; } for (i = 0; master_phe->h_addr_list[i] != 0; i++) { - if ((*(int *)(master_phe->h_addr_list[i]) & netmask) == + if ((*(int *)(master_phe->h_addr_list[i]) & netmask) == (client_addr & netmask)) goto gotit; } @@ -332,7 +332,7 @@ int currarg; extern char *optarg; extern int optind; - /* + /* * PARSE THE COMMAND LINE OPTIONS */ while((getoptch = getopt(argc,argv,"P:f:t:l:p:u:R:w:n:M:adrsvWX")) != (const char)EOF) @@ -344,9 +344,9 @@ extern int optind; break; case 'P': haveproxyserver = 1; - strcpy(proxyserver, optarg); + strcpy(proxyserver, optarg); break; - case 'R': + case 'R': record_all_transactions = 1; break; case 'X': @@ -403,7 +403,7 @@ extern int optind; /* * THE SERVERS NAME MUST BE SPECIFIED */ - + fprintf(stderr,"No WWW Server specified\n"); usage(argv[0]); } @@ -422,7 +422,7 @@ extern int optind; fprintf(stderr, "Invalid network mask (-M %s)\n", network_mask_str); usage(argv[0]); } - + if(strlen(configfile) == 0) { /* @@ -491,12 +491,12 @@ struct sockaddr_in *serveraddr; D_PRINTF( "calling getsockname\n" ); - len = sizeof(struct sockaddr); + len = sizeof(struct sockaddr); if(getsockname(sock, (struct sockaddr *)serveraddr, &len) < 0) { errexit("Could not get socket informaton\n"); } - + return( sock ); } @@ -523,21 +523,21 @@ char *commandline; errexit("Could not retrieve local host name"); } else { /* convert hostname to address (to avoid DNS problems for webclients) */ - /* The following lines are add to copy the system + /* The following lines are add to copy the system buffer (output of gethostbyname()) into user area. This is because, there are very good chances that later on system buffer might be overwritten by some calls and still if your pointer is pointing to same addr. nothing - but only trouble and trouble! Infact this is what + but only trouble and trouble! Infact this is what happening when I tried to run webstone benchmark for more then one clients. It used to over write the webmaster name with the first client name and so remaining on client(s) the webclient process(es) were invoked with wrong webmaster - name! This behaviour is observed Solaris 2.4 this bug + name! This behaviour is observed Solaris 2.4 this bug can be hit in any OS. - Rajesh Shah 5/18/96 */ - + /* master_phe = gethostbyname(hostname); */ - master_phe_tmp = gethostbyname(hostname); + master_phe_tmp = gethostbyname(hostname); master_phe = (struct hostent *)malloc(sizeof(struct hostent)); HostEntCpy(master_phe, master_phe_tmp); } @@ -551,7 +551,7 @@ char *commandline; + 1); strcpy(webclient_path, temp); strcat(webclient_path, "/webclient"); - + } else #else temp = temp; @@ -610,7 +610,7 @@ char *commandline; */ sprintf(tmpcommandline,"%s -n %%d -w %%s -c %%s:%%d", commandline); strcpy(commandline,tmpcommandline); - + if (uil_filelist_f == 0) { cnt = 0; @@ -659,13 +659,13 @@ struct sockaddr_in *serveraddr; { errexit("Could not open config file %s\n", configfile); } - + if ((inetport = getservbyname("exec","tcp")) == 0) { errexit("Could not get service name for exec/tcp\n"); } D_PRINTF( "getservbyname returned %d\n", ntohs(inetport->s_port) ); - + cnt = 0; D_PRINTF( "rexec loop\n" ); @@ -699,7 +699,7 @@ struct sockaddr_in *serveraddr; primename = pick_webmaster_IP_address(clienthostname[cnt], master_phe, network_mask); if (primename == 0) { - errexit("Bad client address %s for Client %d\n", clienthostname[cnt], cnt); + errexit("Bad client address %s for Client %d\n", clienthostname[cnt], cnt); } fprintf(stdout,"Client %d: %s \t# Processes: %d\n Webserver: %s\tWebmaster: %s:%d\n", @@ -725,7 +725,7 @@ struct sockaddr_in *serveraddr; clienthostname[cnt],tmpcommandline); } } - + returnval = NETREAD(tmpfd, buffer, OKSTRLEN); D_PRINTF( "read returns %d, %s\n", returnval, buffer ); @@ -757,15 +757,15 @@ struct sockaddr_in *serveraddr; * THE OTHER PROCESS CONTINUES WITH THE PROGRAM */ D_PRINTF( "Forking webclient stderr/stdout processes\n" ); - switch (fork()) - { + switch (fork()) + { case -1: /* ERROR */ errexit("fork: %s\n", strerror(errno)); case 0: /* CHILD */ - exit(echo_client(clienthostname[cnt], tmpfd)); + exit(echo_client(clienthostname[cnt], tmpfd)); default: /* PARENT */ break; - } + } #else /* start threads to echo stdout/stderr from clients */ _beginthread(echo_client, 0, (void *)0); @@ -832,7 +832,7 @@ int sock; /* * SET THE FD IN THE MASK */ - FD_SET(socknum[cnt],fdset); + FD_SET(socknum[cnt],fdset); } D_PRINTF( "on socket %d\n",socknum[cnt] ); } @@ -877,7 +877,7 @@ int sock; if(!BADSOCKET(socknum[cnt]) && (FD_ISSET(socknum[cnt],&tmpfdset))) { /* - * GET THE READY FROM THIS GUY. + * GET THE READY FROM THIS GUY. * DON'T FORGET TO CLEAR HIS BIT IN THE tmpfdset */ len = NETREAD(socknum[cnt],buffer,READYSTRLEN); @@ -898,7 +898,7 @@ int sock; } sleep(1); fprintf(stdout,"All READYs received\n"); - fflush(stdout); + fflush(stdout); } /* @@ -918,7 +918,7 @@ int *socknum; if(socknum[cnt] > 0) { /* - * SEND A GO + * SEND A GO */ if(NETWRITE(socknum[cnt], GOSTR, GOSTRLEN) != GOSTRLEN) { @@ -948,28 +948,28 @@ stats_t statarray[MAXCLIENTS]; int returnval; int cnt,i; - + /* DOESN'T ACTUALLY PRINT UNTIL THE FIRST CLIENT REPORTS */ fprintf(stdout,"Reading results "); - - /* + + /* * COPY THE FILE DESCRIPTORS TO A TMP LIST, * ALLOCATE MEMORY FOR STATS, PAGESTATS IN TEXT FORM */ leftfdset = *fdset; stats_as_text = (char *)mymalloc(SIZEOF_STATSTEXT+1); page_stats_as_text = (char *)mymalloc(SIZEOF_PAGESTATSTEXT+1); - - /* + + /* * COPY THE FILE DESCRIPTORS TO A TMP LIST, * PLUS A LIST OF REMAINING FDs */ leftfdset = *fdset; - /* + /* * LOOP UNTIL ALL CLIENTS HAVE REPORTED * AND tmpfdset IS EMPTY */ -#ifndef WIN32 +#ifndef WIN32 while(memcmp(&leftfdset,&zerofdset,sizeof(fd_set))) { tmpfdset = leftfdset; @@ -995,7 +995,7 @@ stats_t statarray[MAXCLIENTS]; { /* * SEE WHICH SOCKETS HAVE A INPUT ON THEM PENDING AND - * RECEIVE IT. + * RECEIVE IT. */ /* IS THIS A VALID SOCKET? IS IT READY TO READ? */ @@ -1007,9 +1007,9 @@ stats_t statarray[MAXCLIENTS]; * GET THE TIMING DATA FROM THIS GUY * THEN REMOVE HIM FROM THE tmpfdset */ - /* + /* * READ TIME STATS - * DOES READ() RETURN THE CORRECT LENGTH? + * DOES READ() RETURN THE CORRECT LENGTH? */ D_PRINTF( "About to read timestats, count %d, errno %d\n", cnt, errno ); @@ -1024,9 +1024,9 @@ stats_t statarray[MAXCLIENTS]; fprintf(stderr, "Error reading timing stats: %s\nSocket number %d\n", neterrstr(),socknum[cnt]); abort_clients(); - errexit(""); + errexit(""); } /* end if */ - + /* convert text to stats */ stats_as_text[returnval] = 0; /* add an end marker */ statarray[cnt] = *text_to_stats(stats_as_text); @@ -1036,32 +1036,32 @@ stats_t statarray[MAXCLIENTS]; if(uil_filelist_f) /* READ PAGE STATS */ { - for (i = 0; i < number_of_pages; i++) + for (i = 0; i < number_of_pages; i++) { D_PRINTF( "On page_stats[%d][%d]\n", cnt, i ); returnval = recvdata(socknum[cnt], page_stats_as_text, SIZEOF_PAGESTATSTEXT); D_PRINTF( "Read page stats %d\n", returnval ); - + if (returnval != SIZEOF_PAGESTATSTEXT) /* <= 0) */ { D_PRINTF( "Error reading page_stats[%d][%d]: %s\n", cnt, i, neterrstr() ); fprintf(stderr, "Error reading page_stats[%d][%d]: %s\n", - cnt, i, neterrstr()); + cnt, i, neterrstr()); abort_clients(); errexit(""); } - D_PRINTF( "Page stats: read %d bytes\n", + D_PRINTF( "Page stats: read %d bytes\n", returnval ); - + page_stats_as_text[returnval] = 0; /* add an end marker */ - D_PRINTF("strlen(page_stats_as_text) = %d\n", + D_PRINTF("strlen(page_stats_as_text) = %d\n", strlen(page_stats_as_text)); - page_stats[cnt][i] = + page_stats[cnt][i] = *text_to_page_stats(page_stats_as_text); - - } /* end for */ + + } /* end for */ } /* end if filelist */ FD_CLR(socknum[cnt],&leftfdset); @@ -1113,14 +1113,14 @@ page_stats_t *page_stats_total; { fprintf(stdout,"----------------------------------\n"); /* fprintf(stdout,"Test for host: %s\n",statarray[cnt].hostname); */ - fprintf(stdout,"Total number of pages retrieved from server: %u\n", + fprintf(stdout,"Total number of pages retrieved from server: %u\n", statarray[cnt].totalpages); - + rqstat_fprint(stdout, &(statarray[cnt].rs)); thruput = thruputpersec((double)(statarray[cnt].rs.totalbytes), &(statarray[cnt].rs.totalresponsetime)); - + fprintf(stdout, "Thruput average per connection: %.0f bytes/sec\n", thruput); } @@ -1162,8 +1162,8 @@ page_stats_t *page_stats_total; page_stats_total[j].page_valid = 1; } } - } - + } + /* print page statistics */ if (verbose) { for (i = 0; i < number_of_pages; i++) @@ -1177,12 +1177,12 @@ page_stats_t *page_stats_total; printf ("===============================================================================\n"); printf ("Page # %d\n\n", i); printf ("Total number of times page was hit %u\n", - pst->totalpages); + pst->totalpages); rqstat_print(&(pst->rs)); printf ("Page size %u \n", pst->page_size); - printf ("===============================================================================\n\n"); + printf ("===============================================================================\n\n"); } } } @@ -1215,17 +1215,17 @@ page_stats_t *page_stats_total; fprintf(stdout, "Total number of clients: \t%d\n", totalnumclients); testtime = sumedh_end.tv_sec - sumedh_start.tv_sec; fprintf(stdout,"Test time: \t\t\t%d seconds\n", testtime); - + fprintf(stdout, "Server connection rate: \t%3.2f connections/sec\n", (double)(masterstat.rs.totalconnects)/(testtime)); - + fprintf(stdout, "Server error rate: \t\t%4.4f err/sec\n", (double)(masterstat.rs.totalerrs)/(testtime)); - + fprintf(stdout, "Server thruput: \t\t%2.2f Mbit/sec\n", (double)(8*masterstat.rs.totalbytes)/(testtime*1024*1024)); - - fprintf(stdout, "Little's Load Factor: \t\t%3.2f \n", + + fprintf(stdout, "Little's Load Factor: \t\t%3.2f \n", (double)(masterstat.rs.totalresponsetime.tv_sec) /(testtime)); avgtime(&masterstat.rs.totalresponsetime, @@ -1241,17 +1241,17 @@ page_stats_t *page_stats_total; thruput = 8 * thruputpersec((double)(masterstat.rs.totalbytes), &(masterstat.rs.totalresponsetime)); - + fprintf(stdout, "Average client thruput: \t%4.4f Mbit/sec\n", thruput/(1024*1024)); - fprintf(stdout,"Sum of client response times:\t%u.%u sec\n", + fprintf(stdout,"Sum of client response times:\t%u.%u sec\n", masterstat.rs.totalresponsetime.tv_sec, masterstat.rs.totalresponsetime.tv_usec); - fprintf(stdout,"Total number of pages read:\t%u\n\n", + fprintf(stdout,"Total number of pages read:\t%u\n\n", masterstat.totalpages); - + /* Remaining stats are the same as usual */ rqstat_fprint(stdout, &(masterstat.rs)); @@ -1316,8 +1316,8 @@ main(const int argc, char *argv[]) { socknum[i] = BADSOCKET_VALUE; statarray[i].rs.totalconnects = 0; - } - + } + signal(SIGINT, sig_int); ParseCmdLine( argc, argv); @@ -1329,7 +1329,7 @@ main(const int argc, char *argv[]) totalnumclients = RexecClients( commandline, clienthostname, &serveraddr); /* Initalization of variables. */ - page_stats = + page_stats = (page_stats_t **) mymalloc(totalnumclients*sizeof(page_stats_t *)); for (i=0; i < totalnumclients; i++) @@ -1337,7 +1337,7 @@ main(const int argc, char *argv[]) page_stats[i] = (page_stats_t *) mymalloc(number_of_pages*sizeof(page_stats_t)); } - page_stats_total = + page_stats_total = (page_stats_t *)mymalloc(number_of_pages*sizeof(page_stats_t)); for (i=0; i < totalnumclients; i++) { @@ -1351,15 +1351,15 @@ main(const int argc, char *argv[]) for (i=0; i < number_of_pages; i++) { page_stats_init(&(page_stats_total[i])); } - + for(i = 0; i < totalnumclients; i++) { socknum[i] = BADSOCKET_VALUE; statarray[i].rs.totalconnects = 0; - } + } GetReady( &fdset, totalnumclients, sync_sock ); - NETCLOSE(sync_sock); + NETCLOSE(sync_sock); /* * START ALL OF THE CLIENTS BY SENDING THEM A GO SIGNAL. @@ -1408,7 +1408,7 @@ main(const int argc, char *argv[]) void HostEntCpy(struct hostent *dest, struct hostent *src) { - + dest->h_name = (char *)malloc(strlen(src->h_name)+1); strcpy(dest->h_name, src->h_name); printf("WebMaster name = %s\n", dest->h_name); diff --git a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp b/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp index b528ee190b9..c2b8d78145b 100644 --- a/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp +++ b/ACE/apps/JAWS3/jaws3-todo/Map_Manager_T.cpp @@ -42,7 +42,7 @@ public: JAWS_Map_Manager (size_t size, ACE_Allocator *alloc = 0); //FUZZ: disable check_for_lack_ACE_OS - int open ( size_t size = ACE_DEFAULT_MAP_SIZE, + int open ( size_t size = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); int close (void); @@ -149,7 +149,7 @@ public: JAWS_LRU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0); //FUZZ: disable check_for_lack_ACE_OS - int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, + int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); int close (void); @@ -266,7 +266,7 @@ public: JAWS_LFU_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0); //FUZZ: disable check_for_lack_ACE_OS - int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, + int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); int close (void); @@ -365,7 +365,7 @@ public: JAWS_FIFO_Cache_Replacement (size_t max_entries, ACE_Allocator *alloc = 0); //FUZZ: disable check_for_lack_ACE_OS - int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, + int open ( size_t max_entries = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); int close (void); diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp index f2cb47c531a..07e2d795403 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.cpp @@ -7,40 +7,40 @@ template <class T, class ACE_LOCK> char * JAWS_Cached_Allocator<T, ACE_LOCK>::get_next_pool (char *pool) -{ +{ char *next = 0; char *next_indirect = pool + (this->pool_size_); ACE_OS::memcpy (&next, next_indirect, sizeof (char *)); return next; -} - +} + template <class T, class ACE_LOCK> void JAWS_Cached_Allocator<T, ACE_LOCK>::set_next_pool (char *pool, char *next_pool) -{ +{ char *next_indirect = pool + (this->pool_size_); ACE_OS::memcpy (next_indirect, &next_pool, sizeof (char *)); -} - +} + template <class T, class ACE_LOCK> void JAWS_Cached_Allocator<T, ACE_LOCK>::extend_pool (void) -{ +{ char *new_pool = 0; ACE_NEW (new_pool, char[this->pool_size_ + sizeof (char *)]); - + for (size_t c = 0; c < (this->pool_size_ / sizeof (T)); c++) { void* placement = new_pool + c * sizeof(T); this->free_list_.add (new (placement) ACE_Cached_Mem_Pool_Node<T>); this->set_next_pool (new_pool, 0); } - + if (this->pool_head_ == 0) this->pool_head_ = this->pool_tail_ = new_pool; - else + else this->set_next_pool (this->pool_tail_, new_pool); - + this->pool_tail_ = new_pool; -} +} template <class T, class ACE_LOCK> JAWS_Cached_Allocator<T, ACE_LOCK>::JAWS_Cached_Allocator (size_t n_chunks) diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.cpp b/ACE/apps/JAWS3/jaws3/Concurrency.cpp index 3d42fde5fae..036ef47f4b8 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/Concurrency.cpp @@ -21,7 +21,7 @@ typedef ACE_Singleton<ACE_Message_Block, ACE_SYNCH_NULL_MUTEX> JAWS_Empty_Message_Block; -int +int JAWS_Concurrency_Impl::svc (void) { JAWS_Protocol_Handler *ph; @@ -75,7 +75,7 @@ JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl> { return this->impl_->putq (ph); } - + int JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl> diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp index ea86da1c989..09e8cd3f6cd 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.cpp @@ -26,7 +26,7 @@ JAWS_Concurrency_Bridge<CONCURRENCY_IMPL>::putq (JAWS_Protocol_Handler *ph) { return this->impl_->putq (ph); } - + template <class CONCURRENCY_IMPL> int JAWS_Concurrency_Bridge<CONCURRENCY_IMPL>::getq (JAWS_Protocol_Handler *&ph) diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp index 4dbc6199b56..181b0582f0f 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.cpp +++ b/ACE/apps/JAWS3/jaws3/FILE.cpp @@ -7,7 +7,7 @@ #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL -#endif +#endif #include "jaws3/FILE.h" diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp index 4b2122b46d0..164696ae21a 100644 --- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp +++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.cpp @@ -29,7 +29,7 @@ JAWS_Protocol_Handler::~JAWS_Protocol_Handler (void) } -int +int JAWS_Protocol_Handler::service (void) { if (this->state_ == 0) diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp index 83c3da28bc7..8e0294e682b 100644 --- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp @@ -121,7 +121,7 @@ JAWS_THYBRID_Concurrency::getq (JAWS_Protocol_Handler *&ph) task->putq (mb); result = -1; } - + } } diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp index 4f91c5f34c8..f68f7e22690 100644 --- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp @@ -5,7 +5,7 @@ #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL -#endif +#endif #include "jaws3/TPOOL_Concurrency.h" #include "jaws3/Protocol_Handler.h" diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp index 6e15def5cb8..c20cbca74f8 100644 --- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp +++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.cpp @@ -4,7 +4,7 @@ #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL -#endif +#endif #include "jaws3/Concurrency.h" #include "jaws3/TPR_Concurrency.h" diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp index a429a3fcf8e..ab2b3833a48 100644 --- a/ACE/apps/JAWS3/jaws3/Task_Timer.cpp +++ b/ACE/apps/JAWS3/jaws3/Task_Timer.cpp @@ -16,7 +16,7 @@ JAWS_Task_Timer::JAWS_Task_Timer (void) } -void +void JAWS_Task_Timer::schedule_timer ( long *timer_id , const ACE_Time_Value &delta , JAWS_Event_Completer *completer @@ -44,7 +44,7 @@ JAWS_Task_Timer::schedule_timer ( long *timer_id } -void +void JAWS_Task_Timer::schedule_absolute_timer ( long *timer_id , const ACE_Time_Value &tv , JAWS_Event_Completer *completer diff --git a/ACE/apps/JAWS3/jaws3/Timer.cpp b/ACE/apps/JAWS3/jaws3/Timer.cpp index 33773520ddc..ff13f6dc75f 100644 --- a/ACE/apps/JAWS3/jaws3/Timer.cpp +++ b/ACE/apps/JAWS3/jaws3/Timer.cpp @@ -2,7 +2,7 @@ #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL -#endif +#endif #include "jaws3/Timer.h" #include "jaws3/Task_Timer.h" diff --git a/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp b/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp index 1b7d4b60c41..50b956ea60a 100644 --- a/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp +++ b/ACE/apps/JAWS3/jaws3/Timer_Helpers.cpp @@ -2,7 +2,7 @@ #ifndef JAWS_BUILD_DLL #define JAWS_BUILD_DLL -#endif +#endif #include "jaws3/Timer_Helpers.h" diff --git a/ACE/apps/drwho/Binary_Search.cpp b/ACE/apps/drwho/Binary_Search.cpp index 776c9f4c047..2716c321950 100644 --- a/ACE/apps/drwho/Binary_Search.cpp +++ b/ACE/apps/drwho/Binary_Search.cpp @@ -23,13 +23,13 @@ Protocol_Record * Binary_Search::get_next_entry (void) { // Reset the iterator if we are starting from the beginning. - + if (this->current_ptr_ == 0) this->current_ptr_ = this->sorted_record_; - + // Now check to see if we've hit the end, in which case we set // things up for the next round! - + if (this->current_ptr_ < this->sorted_record_ + this->count_) return *this->current_ptr_++; else @@ -48,13 +48,13 @@ Protocol_Record * Binary_Search::get_each_entry (void) { // Reset the iterator if we are starting from the beginning. - + if (this->current_index_ == -1) this->current_index_ = 0; - + // Now check to see if we've hit the end, in which case we set // things up for the next round! - + for (; this->current_index_ < this->count_; this->current_index_++) @@ -70,7 +70,7 @@ Binary_Search::~Binary_Search (void) if (Options::get_opt (Options::DEBUGGING)) ACE_DEBUG ((LM_DEBUG, "disposing Binary_Search\n")); -} +} // Used to initialize the values for the iterators... diff --git a/ACE/apps/drwho/PMS_All.cpp b/ACE/apps/drwho/PMS_All.cpp index 92a8e45511a..db9eb75703b 100644 --- a/ACE/apps/drwho/PMS_All.cpp +++ b/ACE/apps/drwho/PMS_All.cpp @@ -37,8 +37,8 @@ PMS_All::encode (char *packet, int &packet_length) for (; (prp = this->get_next_friend ()) != 0; *buf_ptr++ = '\t') - buf_ptr = - this->handle_protocol_entries (ACE_OS::strecpy + buf_ptr = + this->handle_protocol_entries (ACE_OS::strecpy (ACE_OS::strecpy (buf_ptr, prp->get_login ()), prp->get_real ()), diff --git a/ACE/apps/drwho/SMR_Client.cpp b/ACE/apps/drwho/SMR_Client.cpp index c7dae2ca3f7..0020b8b1e3c 100644 --- a/ACE/apps/drwho/SMR_Client.cpp +++ b/ACE/apps/drwho/SMR_Client.cpp @@ -12,7 +12,7 @@ SMR_Client::SMR_Client (short port_number) { if (CM_Client::open (port_number) < 0) ACE_ERROR ((LM_ERROR, - "%p\n%a", + "%p\n%a", Options::program_name, 1)); } diff --git a/ACE/apps/drwho/SM_Client.cpp b/ACE/apps/drwho/SM_Client.cpp index 02e552c9af9..a7cab2eaa04 100644 --- a/ACE/apps/drwho/SM_Client.cpp +++ b/ACE/apps/drwho/SM_Client.cpp @@ -11,7 +11,7 @@ // Call-back function that invokes the appropriate decode function. -int +int SM_Client::demux (char *packet, int &packet_length) { @@ -23,7 +23,7 @@ SM_Client::demux (char *packet, // Call-back function that invokes the appropriate encode function. -int +int SM_Client::mux (char *packet, int &packet_length) { switch (Options::protocol_type) @@ -49,12 +49,12 @@ SM_Client::mux (char *packet, int &packet_length) -1); break; default: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "%s: bad protocol\n", Options::program_name)); return -1; } - + if (this->pm_client->encode (packet, packet_length) < 0) return -1; return 1; diff --git a/ACE/apps/drwho/SM_Server.cpp b/ACE/apps/drwho/SM_Server.cpp index 25a43375524..16ef5f1dea1 100644 --- a/ACE/apps/drwho/SM_Server.cpp +++ b/ACE/apps/drwho/SM_Server.cpp @@ -9,7 +9,7 @@ #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" -int +int SM_Server::demux (char *packet, int &packet_length) { switch (GET_PACKET_TYPE (packet)) @@ -35,7 +35,7 @@ SM_Server::demux (char *packet, int &packet_length) -1); break; default: - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "%s: bad protocol\n", Options::program_name)); return -1; @@ -53,7 +53,7 @@ SM_Server::demux (char *packet, int &packet_length) return 1; } -int +int SM_Server::mux (char *packet, int &packet_length) { diff --git a/ACE/bin/ACEutils.pm b/ACE/bin/ACEutils.pm index b7e5a24217c..52ec6787bd1 100644 --- a/ACE/bin/ACEutils.pm +++ b/ACE/bin/ACEutils.pm @@ -9,7 +9,7 @@ package ACE; sub CheckForExeDir { for($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-ExeSubDir') { + if ($ARGV[$i] eq '-ExeSubDir') { if (defined $ARGV[$i + 1]) { $::EXEPREFIX = $ARGV[$i + 1].$::DIR_SEPARATOR; } @@ -27,7 +27,7 @@ sub CheckForExeDir sub CheckForConfig { for($i = 0; $i <= $#ARGV;) { - if ($ARGV[$i] eq '-Config') { + if ($ARGV[$i] eq '-Config') { if (!defined $ARGV[$i + 1]) { print STDERR "You must pass a configuration with Config\n"; exit(1); @@ -44,7 +44,7 @@ sub checkForTarget my($cwd) = shift; for($i = 0; $i <= $#ARGV; $i++) { - if ($ARGV[$i] eq '-chorus') { + if ($ARGV[$i] eq '-chorus') { if (defined $ARGV[$i + 1]) { $::TARGETHOSTNAME = $ARGV[$i + 1]; $::EXEPREFIX = "rsh $::TARGETHOSTNAME arun $cwd$::DIR_SEPARATOR"; diff --git a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm index 00cda95a915..b7a2320788a 100644 --- a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm +++ b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm @@ -20,8 +20,8 @@ use SVNFileLocator; # ************************************************************ sub create { - ## Check for Subversion first. It is unlikely that the .svn directory - ## will exist when Subversion isn't the rcs being used. However, that + ## Check for Subversion first. It is unlikely that the .svn directory + ## will exist when Subversion isn't the rcs being used. However, that ## is not the case for CVS directories. switch: { ((defined $ENV{SVN_ASP_DOT_NET_HACK} && -d '_svn') || -d '.svn') diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt b/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt index c2362a229e6..a4b1b5379b3 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/ReadMe.txt @@ -39,26 +39,26 @@ also involved in testing on the LabVIEW RT target. The remainder of this is what Visual Studio .NET generated for this project. ======================================================================== -AppWizard has created this labview_test_controller DLL for you. +AppWizard has created this labview_test_controller DLL for you. This file contains a summary of what you will find in each of the files that make up your labview_test_controller application. labview_test_controller.vcproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and + This is the main project file for VC++ projects generated using an Application Wizard. + It contains information about the version of Visual C++ that generated the file, and information about the platforms, configurations, and project features selected with the Application Wizard. labview_test_controller.cpp This is the main DLL source file. - When created, this DLL does not export any symbols. As a result, it - will not produce a .lib file when it is built. If you wish this project - to be a project dependency of some other project, you will either need to - add code to export some symbols from the DLL so that an export library - will be produced, or you can set the Ignore Input Library property to Yes - on the General propert page of the Linker folder in the project's Property + When created, this DLL does not export any symbols. As a result, it + will not produce a .lib file when it is built. If you wish this project + to be a project dependency of some other project, you will either need to + add code to export some symbols from the DLL so that an export library + will be produced, or you can set the Ignore Input Library property to Yes + on the General propert page of the Linker folder in the project's Property Pages dialog box. ///////////////////////////////////////////////////////////////////////////// diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp index e8fc7c80550..c6d94e8d10b 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp @@ -25,7 +25,7 @@ // Windows code, not ACE, so we stick to the Microsoft way... // FUZZ: disable check_for_NULL -// This is plain Windows code, not ACE. Therefore we disable +// This is plain Windows code, not ACE. Therefore we disable // the check for ACE_OS // FUZZ: disable check_for_lack_ACE_OS @@ -44,8 +44,8 @@ static const char *format_errmsg (unsigned int errcode, const char *prefix); static const char *LogName = "acetao.log"; static HANDLE logf = INVALID_HANDLE_VALUE; -BOOL APIENTRY DllMain( HANDLE hModule, - DWORD ul_reason_for_call, +BOOL APIENTRY DllMain( HANDLE hModule, + DWORD ul_reason_for_call, LPVOID lpReserved ) { diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp index b3ce1efcf26..0ba8c618571 100644 --- a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp +++ b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp @@ -3,7 +3,7 @@ #include <stdio.h> __declspec(dllimport) int test_entry(void); -// This is plain Windows code, not ACE. Therefore we disable +// This is plain Windows code, not ACE. Therefore we disable // the check for ACE_OS // FUZZ: disable check_for_lack_ACE_OS // FUZZ: disable check_for_improper_main_declaration diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm index 8ff54cfdf6b..5f9e5e5d772 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm @@ -57,8 +57,8 @@ sub pre_workspace { print $fh 'MAKEFILE = ', $self->get_modified_workspace_name($base, '', 1), $crlf; } - - + + sub write_project_targets { my($self) = shift; my($fh) = shift; diff --git a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm index faf10e6277f..7f29c927088 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm @@ -1,7 +1,7 @@ package GNUAutobuildWorkspaceCreator; # ************************************************************ -# Description : A GNU Workspace (GNUmakefile) creator that +# Description : A GNU Workspace (GNUmakefile) creator that # collates build results for a single makefile # before outputting to stdout. # Author : Chad Elliott, minor modifications by Will Otte @@ -34,19 +34,19 @@ my($base) = 'GNUmakefile'; sub extractType { return 'gnuace'; } - + sub write_project_targets { my($self) = shift; my($fh) = shift; my($crlf) = shift; my($target) = shift; my($list) = shift; - + foreach my $project (@$list) { my($dname) = $self->mpc_dirname($project); my($chdir) = ($dname ne '.'); my($output_project) = ($chdir ? $self->mpc_basename($project) : $project); - + print $fh "\t\@", ($chdir ? "cd $dname && " : ''), "\$(MAKE) -f ", diff --git a/ACE/bin/PerlACE/MSProject.pm b/ACE/bin/PerlACE/MSProject.pm index c25d3eb8259..b28fee50e11 100644 --- a/ACE/bin/PerlACE/MSProject.pm +++ b/ACE/bin/PerlACE/MSProject.pm @@ -200,34 +200,34 @@ sub LINKOptions ($) print STDERR "Error: No configuration specified\n"; return; } - - return %{$self->{CONFIGS}}->{$config}->{LINK}; + + return %{$self->{CONFIGS}}->{$config}->{LINK}; } sub Libs($) { my $self = shift; my $config = shift; - + if (!defined $config) { print STDERR "Error: No configuration specified\n"; return; } - + return %{$self->{CONFIGS}}->{$config}->{LIBS}; } sub UsesTAOIDL () { my $self = shift; - + return $self->{TAOIDL}; } sub Compiler () { my $self = shift; - + return $self->{COMPILER}; } @@ -251,24 +251,24 @@ sub Load () while (<$fh>) { if (m/^\#.*Project File - Name=\"([^\"]*)\"/) { - $self->{NAME} = $1; + $self->{NAME} = $1; } - + if (m/^\#.*Format Version (.*)/) { $self->{VERSION} = $1; } # Check for configurations - + if (m/^\!.*IF \"\$\(CFG\)\" == \".* - (.*)$\"/) { $config = $1; } elsif (m/^\!ENDIF$/) { $config = ""; } - + # Check for directories - + if (m/\# PROP Output_Dir \"(.*)\"/) { %{$self->{CONFIGS}}->{$config}->{OUTPUTDIR} = $1; } @@ -278,12 +278,12 @@ sub Load () elsif (m/\# PROP Target_Dir \"(.*)\"/) { %{$self->{CONFIGS}}->{$config}->{TARGETDIR} = $1; } - + # Look at CPP options - + if (m/\# ADD BASE CPP(.*)$/ || m/\# ADD CPP(.*)$/) { my @flags = split (/ \//, $1); - + foreach my $flag (@flags) { if ($flag && %{$self->{CONFIGS}}->{$config}->{CPP} !~ m/$flag/) { %{$self->{CONFIGS}}->{$config}->{CPP} .= " /$flag"; @@ -292,66 +292,66 @@ sub Load () } elsif (m/\# SUBTRACT CPP(.*)$/ || m/\# SUBTRACT BASE CPP(.*)$/) { my @flags = split (/ \//, $1); - + foreach my $flag (@flags) { if ($flag && %{$self->{CONFIGS}}->{$config}->{CPP} =~ m/$flag/) { %{$self->{CONFIGS}}->{$config}->{CPP} =~ s/ \/$flag//g; } } } - + # Look at LINK32 options - - if (m/\# ADD BASE LINK32(.*)$/ || m/\# ADD LINK32(.*)$/ + + if (m/\# ADD BASE LINK32(.*)$/ || m/\# ADD LINK32(.*)$/ || m/\# ADD BASE LIB32(.*)$/ || m/\# ADD LIB32(.*)$/) { my @flags = split (/ \//, $1); - + foreach my $flag (@flags) { my $found = 0; my @libs = split (/ /, $flag); - + foreach my $lib (@libs) { if ($lib =~ m/\.lib$/) { if (%{$self->{CONFIGS}}->{$config}->{LIBS} !~ m/\Q$lib\E/) { %{$self->{CONFIGS}}->{$config}->{LIBS} .= " $lib"; } $found = 1; - } + } } - + if (!$found && $flag) { my $shortflag = $flag; if ($flag =~ m/^(.*)\:/) { $shortflag = $1; } - + if (%{$self->{CONFIGS}}->{$config}->{LINK} !~ m/ \/$shortflag/) { %{$self->{CONFIGS}}->{$config}->{LINK} .= " /$flag"; } } } } - elsif (m/\# SUBTRACT BASE LINK32(.*)$/ || m/\# SUBTRACT LINK32(.*)$/ + elsif (m/\# SUBTRACT BASE LINK32(.*)$/ || m/\# SUBTRACT LINK32(.*)$/ || m/\# SUBTRACT BASE LIB32(.*)$/ || m/\# SUBTRACT LIB32(.*)$/) { my @flags = split (/ \//, $1); - + foreach my $flag (@flags) { my $shortflag = $flag; if ($flag =~ m/^(.*)\:/) { $shortflag = $1; } - + if ($flag && %{$self->{CONFIGS}}->{$config}->{LINK} =~ m/ (\/$shortflag\:[^ ]*)/) { %{$self->{CONFIGS}}->{$config}->{LINK} =~ s/ \Q$1\E//ig; } } } - + if (m/^\# Name \".* - (.*)\"/ && defined %{$self->{CONFIGS}}->{"Unknown"}) { %{$self->{CONFIGS}}->{$1} = %{$self->{CONFIGS}}->{"Unknown"}; delete %{$self->{CONFIGS}}->{"Unknown"}; } - + if (m/tao\_idl/ && m/\$\(InputName\)\.idl/ || m/tao\_idl/ && m/\$\(InputPath\)/) { $self->{TAOIDL} = 1; } @@ -368,12 +368,12 @@ sub Build ($) { my $self = shift; my ($config) = @_; - - my $command = $self->Compiler () . " " . $self->Filename () + + my $command = $self->Compiler () . " " . $self->Filename () . " /USEENV" . " /MAKE \"" . $self->Name () . " - " . $config . "\""; - + system $command; } @@ -381,12 +381,12 @@ sub Clean ($) { my $self = shift; my ($config) = @_; - - my $command = $self->Compiler () . " " . $self->Filename () + + my $command = $self->Compiler () . " " . $self->Filename () . " /USEENV" . " /MAKE \"" . $self->Name () . " - " . $config . "\" /CLEAN"; - + system $command; } diff --git a/ACE/bin/PerlACE/MSProject/DSP.pm b/ACE/bin/PerlACE/MSProject/DSP.pm index b7ca0276a82..9f5b67f8087 100644 --- a/ACE/bin/PerlACE/MSProject/DSP.pm +++ b/ACE/bin/PerlACE/MSProject/DSP.pm @@ -11,12 +11,12 @@ our @ISA = ("PerlACE::MSProject"); # Constructor -sub new +sub new { my $proto = shift; my $class = ref ($proto) || $proto; my $self = $class->SUPER::new (@_); - + $self->{COMPILER} = "msdev.com"; bless ($self, $class); diff --git a/ACE/bin/PerlACE/MSProject/VCP.pm b/ACE/bin/PerlACE/MSProject/VCP.pm index 8377d22788b..2e80a258b87 100644 --- a/ACE/bin/PerlACE/MSProject/VCP.pm +++ b/ACE/bin/PerlACE/MSProject/VCP.pm @@ -11,12 +11,12 @@ our @ISA = ("PerlACE::MSProject"); # Constructor -sub new +sub new { my $proto = shift; my $class = ref ($proto) || $proto; my $self = $class->SUPER::new (@_); - + $self->{COMPILER} = "evc.com"; bless ($self, $class); diff --git a/ACE/bin/PerlACE/Process_Win32.pm b/ACE/bin/PerlACE/Process_Win32.pm index 34880bb9d6f..0cbbd42ab99 100644 --- a/ACE/bin/PerlACE/Process_Win32.pm +++ b/ACE/bin/PerlACE/Process_Win32.pm @@ -459,7 +459,7 @@ sub kill_all my $procmask = shift; my $target = shift; my $pid = -1; - for my $line (`tasklist /nh /fo csv`) { + for my $line (`tasklist /nh /fo csv`) { # find matching process line if ($line =~ /$procmask/) { # find process PID diff --git a/ACE/bin/PerlACE/Run_Test.pm b/ACE/bin/PerlACE/Run_Test.pm index c94c7008910..d5d91116e50 100644 --- a/ACE/bin/PerlACE/Run_Test.pm +++ b/ACE/bin/PerlACE/Run_Test.pm @@ -230,7 +230,7 @@ sub add_path { sub add_lib_path { my($value) = shift; - + # Set the library path supporting various platforms. foreach my $env ('PATH', 'DYLD_LIBRARY_PATH', 'LD_LIBRARY_PATH', 'SHLIB_PATH') { diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm index f7f1adaae1c..4d697c185d8 100644 --- a/ACE/bin/PerlACE/TestTarget.pm +++ b/ACE/bin/PerlACE/TestTarget.pm @@ -447,7 +447,7 @@ sub KillAll ($) { my $self = shift; my $procmask = shift; - PerlACE::Process::kill_all ($procmask, $self); + PerlACE::Process::kill_all ($procmask, $self); } 1; diff --git a/ACE/bin/PerlACE/TestTarget_VxWorks.pm b/ACE/bin/PerlACE/TestTarget_VxWorks.pm index 37c967587c8..5a072181da0 100644 --- a/ACE/bin/PerlACE/TestTarget_VxWorks.pm +++ b/ACE/bin/PerlACE/TestTarget_VxWorks.pm @@ -86,7 +86,7 @@ sub KillAll ($) { my $self = shift; my $procmask = shift; - PerlACE::ProcessVX::kill_all ($procmask, $self); + PerlACE::ProcessVX::kill_all ($procmask, $self); } 1; diff --git a/ACE/bin/PerlACE/TestTarget_WinCE.pm b/ACE/bin/PerlACE/TestTarget_WinCE.pm index 5dc0c1b8277..e7e32a794da 100644 --- a/ACE/bin/PerlACE/TestTarget_WinCE.pm +++ b/ACE/bin/PerlACE/TestTarget_WinCE.pm @@ -183,7 +183,7 @@ sub KillAll ($) { my $self = shift; my $procmask = shift; - PerlACE::ProcessVX::kill_all ($procmask, $self); + PerlACE::ProcessVX::kill_all ($procmask, $self); } 1; diff --git a/ACE/bin/clean_dsp.pl b/ACE/bin/clean_dsp.pl index a3ff9be8205..9f3f54e63c8 100755 --- a/ACE/bin/clean_dsp.pl +++ b/ACE/bin/clean_dsp.pl @@ -12,8 +12,8 @@ open (FILE, "<$ARGV[0]"); loop: while (<FILE>) { - # Check for dependency information - + # Check for dependency information + if (/^DEP/ || /^NODEP/) { $in_dependency = 1; } @@ -22,19 +22,19 @@ loop: while (<FILE>) $in_dependency = 0 if (!/\\$/); goto loop; } - + # Check for empty !IF blocks if (/^\!IF/) { ++$if_depth; } - push @saved_lines, $_ + push @saved_lines, $_ if ($if_depth > 0); if (/^\!ENDIF/) { --$if_depth; - print @saved_lines + print @saved_lines if ($if_depth == 0 && $dirty == 1); @saved_lines = (); $dirty = 0; @@ -42,9 +42,9 @@ loop: while (<FILE>) elsif ($if_depth == 0) { print; } - + $dirty = 1 - if ($if_depth > 0 && !/^\!/ && !/^\s+$/); + if ($if_depth > 0 && !/^\!/ && !/^\s+$/); } diff --git a/ACE/bin/doxygen-convert-h.pl b/ACE/bin/doxygen-convert-h.pl index 279359eb41b..ec0c929a120 100755 --- a/ACE/bin/doxygen-convert-h.pl +++ b/ACE/bin/doxygen-convert-h.pl @@ -87,7 +87,7 @@ sub verify (@) my (@contents) = @_; print "Verification\n" if (defined $opt_d); - + my $found_id = 0; my $found_filename = 0; @@ -99,8 +99,8 @@ sub verify (@) return 0 if ($found_id == 1 && $found_filename == 1); # failed - return 1; -} + return 1; +} sub format_description (@) { @@ -146,7 +146,7 @@ sub fix_file_header (@) push @after, $line; next LOOP; } - + if ($state eq 'before') { if ($line =~ /\-\*\- C\+\+ \-\*\-/) { push @after, $line; @@ -167,7 +167,7 @@ sub fix_file_header (@) push @after, $line; } } - + if ($state eq 'filename') { if ($line =~ /\/\/ (.+)/) { push @after, " * \@file $1\n"; @@ -188,7 +188,7 @@ sub fix_file_header (@) ### Fall through so the after can put the ending in } } - + if ($state eq 'description') { if ($line =~ /\= AUTHOR/) { push @after, format_description (@description); @@ -236,7 +236,7 @@ sub fix_file_header (@) } } } - + if ($state eq 'after') { if ($line =~ /===================/) { ## print the rest @@ -263,14 +263,14 @@ sub fix_class_headers (@) my $classname = ""; my $state = 'outside'; - ## state = + ## state = ## outside = not in class ## template = stored template line ## class = started collecting lines, in case of a class ## header = after a class foo, but before any methods print "Fixing class headers\n" if (defined $opt_d); - + LOOP: foreach $line (@before) { printf ("%10s %s", $state, $line) if (defined $opt_D); @@ -342,7 +342,7 @@ sub fix_class_headers (@) my $indent = $1; push @after, "$indent/**\n"; push @after, "$indent * \@class $classname\n"; - + foreach $header (@headers) { if ($header =~ /\= TITLE/) { push @after, "$indent *\n"; @@ -417,15 +417,15 @@ sub fix_class_members (@) my $level = 0; print "Fixing class methods\n" if (defined $opt_d); - + LOOP: foreach $line (@before) { if ($line =~ /\{/ && $line !~ /^\s*\/\//) { $level++; } - if ($line =~ /^\s*class/ - && $line !~ /\;/ - && $level == $classlevel) + if ($line =~ /^\s*class/ + && $line !~ /\;/ + && $level == $classlevel) { $classlevel++; } @@ -436,7 +436,7 @@ sub fix_class_members (@) } $level--; } - + printf ("%2d%2d", $level, $classlevel) if (defined $opt_D); if ($level == $classlevel && $level > 0) { @@ -458,7 +458,7 @@ sub fix_class_members (@) } elsif ($line =~ /^\s*\/\//) { print "C $line" if (defined $opt_D); - + if ($#method >= 0) { push @comment, $line; } @@ -498,9 +498,9 @@ FILELOOP: foreach $file (@files) { print "\n" if (defined $opt_d); print "$file\n"; print "\n" if (defined $opt_d); - + $fail = 0; - + my @contents = (); ### Read file into @contents @@ -517,7 +517,7 @@ FILELOOP: foreach $file (@files) { ### Verify file print "Verifying file\n" if (defined $opt_d); - + if (!defined $opt_u) { if (verify (@contents) == 1) { print "$file did not pass verification\n"; @@ -541,7 +541,7 @@ FILELOOP: foreach $file (@files) { else { if (defined $opt_s) { print @contents; - } + } elsif (!defined $opt_D) { ### Save @contents back to the file print "Saving\n" if (defined $opt_d); diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f3adcee01b3..e3777f2c296 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -2138,6 +2138,7 @@ if ($opt_t) { print "--------------------Configuration: Fuzz - Level ",$opt_l, "--------------------\n"; +check_for_trailing_whitespace () if ($opt_l >= 4); check_for_lack_ACE_OS () if ($opt_l >= 6); check_for_ACE_Guard () if ($opt_l >= 1); check_for_generated_headers () if ($opt_l >= 6); @@ -2179,7 +2180,6 @@ check_for_improper_main_declaration () if ($opt_l >= 1); check_for_TAO_Local_RefCounted_Object () if ($opt_l >= 1); check_for_ORB_init () if ($opt_l >= 1); check_for_export_file () if ($opt_l >= 6); -check_for_trailing_whitespace () if ($opt_l >= 6); print "\nfuzz.pl - $errors error(s), $warnings warning(s)\n"; diff --git a/ACE/bin/g++_metric.sh b/ACE/bin/g++_metric.sh index 93af97932a1..b24fc2bf355 100755 --- a/ACE/bin/g++_metric.sh +++ b/ACE/bin/g++_metric.sh @@ -17,12 +17,12 @@ do shift target=$1 break - fi + fi shift done # echo out "(%x)", the return value from g++, so the script processes the output -# will only use times for successful compilations, i.e., "(0)". +# will only use times for successful compilations, i.e., "(0)". /usr/bin/time -f "//compile time(%x): ${PWD#$ACE_ROOT/}/${target} %U %S" g++ $commandline retval=$? diff --git a/ACE/bin/regenerate_exports.pl b/ACE/bin/regenerate_exports.pl index 95e6bf67986..1261834e8ff 100755 --- a/ACE/bin/regenerate_exports.pl +++ b/ACE/bin/regenerate_exports.pl @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' if 0; # $Id$ -# Goes through ACE/TAO and replaces +# Goes through ACE/TAO and replaces use File::Find; use Cwd; @@ -37,7 +37,7 @@ sub wanted if ($flag == 1) { print "Regenerating: $file\n"; - if ($OSNAME eq 'MSWIn32') { + if ($OSNAME eq 'MSWIn32') { $file =~ s/\//\\/g; } system ("perl -S generate_export_file.pl $args $name > $file"); diff --git a/ACE/bin/topinfo_iorsize_stats.sh b/ACE/bin/topinfo_iorsize_stats.sh index 86088779c0b..7e1f2699326 100755 --- a/ACE/bin/topinfo_iorsize_stats.sh +++ b/ACE/bin/topinfo_iorsize_stats.sh @@ -37,7 +37,7 @@ server_start_size=`cat /proc/$s_id/status | grep VmRSS | awk '{print $2}'`; # Just sleep for 2 seconds. sleep 2; -# Check whether the server has started +# Check whether the server has started file="test.ior" if test -f $file then @@ -46,11 +46,11 @@ if test -f $file c_id=$!; # Wait till all the invocations are done sleep 30; - # Get the size once the client has made sufficient invocations. + # Get the size once the client has made sufficient invocations. s_invocations=`cat /proc/$s_id/status | grep VmRSS | awk '{print $2}'`; let "actual_server_growth=${s_invocations}-${server_start_size}"; if test $OPT == 1 - then + then echo $DATE $s_invocations >> $DEST/source/server_opt_ior_size.txt echo $DATE $actual_server_growth >> $DEST/source/opt_ior_size.txt else @@ -59,7 +59,7 @@ if test -f $file fi # Kill the server and client. We will look at better ways of doing - # this later. + # this later. kill -9 $c_id; kill -9 $s_id; rm -f $file diff --git a/ACE/bin/topinfo_simple_stats.sh b/ACE/bin/topinfo_simple_stats.sh index dab12934160..cb39a724755 100755 --- a/ACE/bin/topinfo_simple_stats.sh +++ b/ACE/bin/topinfo_simple_stats.sh @@ -27,12 +27,12 @@ cd TAO/performance-tests/Memory/Single_Threaded s_id=$!; # Just sleep for 2 seconds. sleep 2; -# Check whether the server has started +# Check whether the server has started file="test.ior" if test -f $file then # Just get the size as soon the server is started, ie. the vanilla - # server. + # server. s_up=`cat /proc/$s_id/status | grep VmRSS | awk '{print $2}'`; # Write it a file @@ -42,19 +42,19 @@ if test -f $file c_id=$!; # Wait till all the invocations are done sleep 10; - # Get the size once the client has made sufficient invocations. + # Get the size once the client has made sufficient invocations. s_invocations=`cat /proc/$s_id/status | grep VmRSS| awk '{print $2}'`; - + echo $DATE $s_invocations >> $DEST/source/st_after_invoke_size.txt - + # Get teh size of the client after all the invocations c_invocations=`cat /proc/$c_id/status | grep VmRSS | awk '{print $2}'`; echo $DATE $c_invocations >> $DEST/source/st_client_size.txt # Kill the server and client. We will look at better ways of doing - # this later. + # this later. kill -9 $c_id; - + # Just sleep for the server to release memory etc. sleep 5; diff --git a/ACE/bin/topinfo_stats.sh b/ACE/bin/topinfo_stats.sh index 5e572f357b9..9f3a845e425 100755 --- a/ACE/bin/topinfo_stats.sh +++ b/ACE/bin/topinfo_stats.sh @@ -27,12 +27,12 @@ cd TAO/performance-tests/Memory/Single_Threaded s_id=$!; # Just sleep for 2 seconds. sleep 2; -# Check whether the server has started +# Check whether the server has started file="test.ior" if test -f $file then # Just get the size as soon the server is started, ie. the vanilla - # server. + # server. s_up=`top -p $s_id -n 1 -b | grep $US| awk '{print $5}'`; # Write it a file @@ -42,15 +42,15 @@ if test -f $file c_id=$!; # Wait till all the invocations are done sleep 10; - # Get the size once the client has made sufficient invocations. + # Get the size once the client has made sufficient invocations. s_invocations=`top -p $s_id -n 1 -b | grep $US| awk '{print $5}'`; - + echo $DATE $s_invocations >> $DEST/source/st_after_invoke_size.txt # Kill the server and client. We will look at better ways of doing - # this later. + # this later. kill -9 $c_id; - + # Just sleep for the server to release memory etc. sleep 5; diff --git a/ACE/bin/update-ace+tao.sh b/ACE/bin/update-ace+tao.sh index 9956eb8bb0e..9081750d181 100755 --- a/ACE/bin/update-ace+tao.sh +++ b/ACE/bin/update-ace+tao.sh @@ -26,8 +26,8 @@ tao_version=`version <TAO/VERSION TAO` if [ -z $ace_version ]; then echo No ACE version after update; exit 1; fi if [ -z $tao_version ]; then echo No TAO version after update; exit 1; fi -echo Old software version tags: $old_ace_version $old_tao_version -echo New software version tags: $ace_version $tao_version +echo Old software version tags: $old_ace_version $old_tao_version +echo New software version tags: $ace_version $tao_version # Conserve net bandwidth if no change was observed if [ $old_ace_version != $ace_version ] || [ x"$1"x = x"force"x ]; then diff --git a/ACE/contrib/FaCE/License.txt b/ACE/contrib/FaCE/License.txt index ceaf85d3550..21719fba73b 100644 --- a/ACE/contrib/FaCE/License.txt +++ b/ACE/contrib/FaCE/License.txt @@ -24,4 +24,4 @@ all rights reserved. == Warranty Information == -FaCE is provided 'as is' without warranties of any kind. +FaCE is provided 'as is' without warranties of any kind. diff --git a/ACE/contrib/minizip/miniunz.c b/ACE/contrib/minizip/miniunz.c index a78242a16c5..55f82b5c11f 100644 --- a/ACE/contrib/minizip/miniunz.c +++ b/ACE/contrib/minizip/miniunz.c @@ -319,7 +319,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password) printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename); ret = scanf("%1s",answer); - if (ret != 1) + if (ret != 1) { exit(EXIT_FAILURE); } @@ -569,7 +569,7 @@ int main(argc,argv) return do_list(uf); else if (opt_do_extract==1) { - if (opt_extractdir && chdir(dirname)) + if (opt_extractdir && chdir(dirname)) { printf("Error changing into %s, aborting\n", dirname); exit(-1); diff --git a/ACE/contrib/minizip/mztools.c b/ACE/contrib/minizip/mztools.c index 1bb1cfb8fc8..9047871b212 100644 --- a/ACE/contrib/minizip/mztools.c +++ b/ACE/contrib/minizip/mztools.c @@ -226,17 +226,17 @@ uLong* bytesRecovered; WRITE_32(header + 12, offsetCD); /* size of CD */ WRITE_32(header + 16, offset); /* offset to CD */ WRITE_16(header + 20, comsize); /* comment */ - + /* Header */ if (fwrite(header, 1, 22, fpOutCD) == 22) { - + /* Comment field */ if (comsize > 0) { if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { err = Z_ERRNO; } } - + } else { err = Z_ERRNO; } @@ -258,14 +258,14 @@ uLong* bytesRecovered; fclose(fpOutCD); } } - + /* Close */ fclose(fpZip); fclose(fpOut); - + /* Wipe temporary file */ (void)remove(fileOutTmp); - + /* Number of recovered entries */ if (err == Z_OK) { if (nRecovered != 0) { diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c index 171c2281562..14f5621f824 100644 --- a/ACE/contrib/minizip/unzip.c +++ b/ACE/contrib/minizip/unzip.c @@ -670,12 +670,12 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file, else err=UNZ_ERRNO; } - + if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) - { + { if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead) err=UNZ_ERRNO; - + lSeek += file_info.size_file_extra - uSizeRead; } } diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c index b39b9bfd640..a57fcfc61ef 100644 --- a/ACE/contrib/minizip/zip.c +++ b/ACE/contrib/minizip/zip.c @@ -944,7 +944,7 @@ extern MINIZIP_EXPORT int zipWriteInFileInZip (zipFile file,const void* buf,unsi { uLong uTotalOutBefore = zi->ci.stream.total_out; err=deflate(&zi->ci.stream, Z_NO_FLUSH); - zi->ci.pos_in_buffered_data += + zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore); } else diff --git a/ACE/debian/cmp-installation.sh b/ACE/debian/cmp-installation.sh index d12d8e83dd8..63f98710fed 100755 --- a/ACE/debian/cmp-installation.sh +++ b/ACE/debian/cmp-installation.sh @@ -20,7 +20,7 @@ ff() { # Remove path with examples, tests and tutorial from STDIN drop() { - grep -E -v '(examples|tests|tutorials)/' + grep -E -v '(examples|tests|tutorials)/' } # Removed unused/unshipped stuff diff --git a/ACE/docs/msvc_notes.txt b/ACE/docs/msvc_notes.txt index a0965a3e8bc..aa3b6508773 100644 --- a/ACE/docs/msvc_notes.txt +++ b/ACE/docs/msvc_notes.txt @@ -2,7 +2,7 @@ @page msvc Miscellaneous Notes for ACE/TAO and Microsoft Visual C++ Here are just some random information about ACE/TAO with Microsoft Visual -C++. This is more a collection of ideas right now, so it may not be as +C++. This is more a collection of ideas right now, so it may not be as polished as other ACE documentation. @subsection msvc_configurations Configurations @@ -17,10 +17,10 @@ project and solution files. Project files with _Static extension denote workspaces for building static libraries. Different configurations produce different libraries and executables. For -example, Debug versions of dynamic libraries are always named *d.dll (like +example, Debug versions of dynamic libraries are always named *d.dll (like aced.dll) and the executables are placed in the current directory. Release versions of dynamic libraries are named *.dll (such as ace.dll) and their -executables are usually placed in the Release subdirectory. Other common +executables are usually placed in the Release subdirectory. Other common suffixes include *sd.lib for Static Debug and *s.lib for Static Release. Projects only use the same configuration versions of the libraries. The Debug @@ -30,8 +30,8 @@ version of an ACE example only uses debug version of ACE library. Other compile time options are set or unset via the config.h file. For example, to turn on a compile time definition, #define it at the beginning of -config.h. Unsetting a definition just requires #define ACE_FOO 0 or a #undef -at the end of the file (after including config-win32.h). Different macros +config.h. Unsetting a definition just requires #define ACE_FOO 0 or a #undef +at the end of the file (after including config-win32.h). Different macros require different techniques. @subsection msvc_libraries ACE/TAO Libraries @@ -40,7 +40,7 @@ I don't think we have any documents really giving any info on what libraries are produced by the MSVC project files. So unlike the Unix platforms, Win32 libraries do not have a prefix of "lib", -instead it is used as an extension. For example, the debug version of the +instead it is used as an extension. For example, the debug version of the dynamic ace library is aced.lib (which is a stub for aced.dll). The three ACE libraries are: @@ -55,11 +55,11 @@ in TAO_PortableServer). And finally we have the orbsvcs libraries. Each ORB service is contained in its own library. More libraries may be needed to be linked in, since -some services require the use of others (such as TAO_AV requiring -TAO_CosTrading and TAO_CosProperty). +some services require the use of others (such as TAO_AV requiring +TAO_CosTrading and TAO_CosProperty). The *.lib and *.dll files are located in ACE_wrappers/lib. You need -to point your PATH to $ACE_ROOT/lib for running the applications. +to point your PATH to $ACE_ROOT/lib for running the applications. I hesitate to put down explicit instructions on what libraries need to be linked in, considering that the libraries are being split apart more and more @@ -70,19 +70,19 @@ TAO_DynamicAny.lib is also needed. Then if any of the ORB Services are used, more libraries are needed. For example, a client that uses the Name Service would need to link TAO_CosNaming.lib. -And note that the release versions of the libraries are listed above. For +And note that the release versions of the libraries are listed above. For debug configurations the libraries would be aced.lib, TAOd.lib, etc. @subsection msvc_external_projects External ACE/TAO Projects -It is a little difficult for us to list how exactly one should create +It is a little difficult for us to list how exactly one should create projects that use ACE/TAO but are external to the ACE_wrappers tree. Since most projects we create are in that tree, we can make assumptions about -directory structure that doesn't always apply for external projects. In -other words, we have ideas how they should work, but they usually remain +directory structure that doesn't always apply for external projects. In +other words, we have ideas how they should work, but they usually remain a bit, um, untested. :-) -There are three main dependencies a project would have on ACE/TAO. +There are three main dependencies a project would have on ACE/TAO. - Include paths: Since all the headers use a subdirectory way of referring to include files (such as "ace/OS.h" instead of just "OS.h"). In order @@ -90,28 +90,28 @@ There are three main dependencies a project would have on ACE/TAO. ACE_wrappers\TAO\orbsvcs, etc.) to the additional include paths of the project or in MSVC. I believe it is a better idea to add them to the global MSVC directories. That way the path to ACE on a machine doesn't get hard - coded into the project itself (this should make it easier to move the + coded into the project itself (this should make it easier to move the project between machines where ACE is installed in different places). -- Libraries and library paths: Depending on what features are needed, +- Libraries and library paths: Depending on what features are needed, different libraries are needed to be linked in. (This is covered more in an above section). These libraries are specified in the project, but can be specified in different ways. The first is the hard coded way (a full path, such as "C:\ACE_wrappers\ace\aced.lib"). The second is listing only the library (such as "aced.lib") and then specify the path either in the project or via MSVC global settings. Just like for the include paths, MSVC - global settings is probably the more robust way of specifying this. + global settings is probably the more robust way of specifying this. - TAO_IDL: TAO's IDL compiler resides in ACE_wrappers\bin. If the external project contains IDL files, then a custom build configuration can be used - to automatically call TAO_IDL. Note that the location of the release + to automatically call TAO_IDL. Note that the location of the release version of the compiler is in ACE_wrappers\bin\Release (although it doesn't - matter which version you use, they both produce the same output). If + matter which version you use, they both produce the same output). If ACE_wrappers\bin is included in the path, then the build command can just refer to tao_idl and it can be found via the path. The other options are - to refer to tao_idl via an absolute hard coded path or to add + to refer to tao_idl via an absolute hard coded path or to add ACE_wrappers\bin to the MSVC's global executable path settings. Either - way the bin directory must be in the path or in the global settings so + way the bin directory must be in the path or in the global settings so tao_idl can find aced.dll. So I guess in summary we would recommend adding most of the settings to Visual @@ -122,10 +122,10 @@ and just refer to the libraries without any paths. ACE_ROOT is an interesting environment variable. Even though it is heavily used on Unix (in fact, ACE/TAO will not compile without it) it really isn't -needed for MSVC. The reason for this is that we were interested in making -configuration and setup really easy for Visual C++ on Windows. In retrospect -it might have made quite a few things easier to specify if ACE_ROOT was -required. One thing you might notice is that TAO_IDL will display a message +needed for MSVC. The reason for this is that we were interested in making +configuration and setup really easy for Visual C++ on Windows. In retrospect +it might have made quite a few things easier to specify if ACE_ROOT was +required. One thing you might notice is that TAO_IDL will display a message if ACE_ROOT isn't set, but it is only a problem if the IDL file includes <orb.idl> and you don't use -I to specify where orb.idl is. diff --git a/ACE/docs/run_test.txt b/ACE/docs/run_test.txt index 8d5d30ffce5..3c159ed0b00 100644 --- a/ACE/docs/run_test.txt +++ b/ACE/docs/run_test.txt @@ -243,13 +243,13 @@ $client->DeleteFile($client_iorfile); exit $status; @endverbatim -This example illustrates how to get the host name within the cross -platform test. In your test program add functionality to handle a -command line argument to pass the host name of the target. In the +This example illustrates how to get the host name within the cross +platform test. In your test program add functionality to handle a +command line argument to pass the host name of the target. In the run_test.pl script you can use the following code as example. @verbatim -my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $hostname = $server->HostName(); $SV = $server->CreateProcess ("server", "-ORBEndpoint iiop://$hostname:43210"); $CL = $server->CreateProcess ("client", " -p 43210 -h $hostname"); diff --git a/ACE/examples/APG/Logging/Change_Instance_Default.cpp b/ACE/examples/APG/Logging/Change_Instance_Default.cpp index e22af840259..03b273073df 100644 --- a/ACE/examples/APG/Logging/Change_Instance_Default.cpp +++ b/ACE/examples/APG/Logging/Change_Instance_Default.cpp @@ -11,7 +11,7 @@ #include "ace/Log_Msg.h" #include "ace/Thread_Manager.h" -ACE_THR_FUNC_RETURN worker (void *) +ACE_THR_FUNC_RETURN worker (void *) { // do some work return 0; diff --git a/ACE/examples/APG/Logging/Simple1.cpp b/ACE/examples/APG/Logging/Simple1.cpp index cf7a12e410b..91198db2992 100644 --- a/ACE/examples/APG/Logging/Simple1.cpp +++ b/ACE/examples/APG/Logging/Simple1.cpp @@ -7,7 +7,7 @@ void foo (void); int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_TRACE("main"); - + ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IHi Mom\n"))); foo(); ACE_DEBUG ((LM_INFO, ACE_TEXT ("%IGoodnight\n"))); diff --git a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp index 306eefcd83a..b45f6ae662f 100644 --- a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp +++ b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp @@ -7,7 +7,7 @@ void foo (void); int ACE_TMAIN (int, ACE_TCHAR *[]) { ACE_TRACE ("main"); - + // Listing 1 code/ch03 ACE_DEBUG ((MY_DEBUG ACE_TEXT ("Hi Mom\n"))); diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp index 215381df394..22d5390c0e5 100644 --- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp +++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp @@ -124,7 +124,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) // Listing 3 code/ch07 TemperatureSensor *sensorOne = new TemperatureSensor ("Kitchen"); - + ACE_Reactor::instance ()->schedule_timer (temperatureMonitor, sensorOne, initialDelay, @@ -135,7 +135,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) // Listing 4 code/ch07 TemperatureSensor *sensorTwo = new TemperatureSensor ("Foyer"); - + ACE_Reactor::instance ()->schedule_timer (temperatureMonitor, sensorTwo, initialDelay, diff --git a/ACE/examples/APG/Streams/RecordingDeviceFactory.cpp b/ACE/examples/APG/Streams/RecordingDeviceFactory.cpp index f5585e1ec0a..beded2e5e3c 100644 --- a/ACE/examples/APG/Streams/RecordingDeviceFactory.cpp +++ b/ACE/examples/APG/Streams/RecordingDeviceFactory.cpp @@ -13,7 +13,7 @@ RecordingDevice *RecordingDeviceFactory::instantiate (int argc, // Exclude 2 device = new TextListenerAcceptor (); // Exclude 2 - + // Initialize the device with the remaining parameters. if (device->init (argc, argv) < 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp index 3aac199d793..2751f909e95 100644 --- a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp @@ -23,10 +23,10 @@ public: // Put this thread in a compute loop.. no // cancellation points are available. } -#if defined (__HP_aCC) +#if defined (__HP_aCC) // This is only to workaround a warning on HP-UX compiler. return 0; -#endif /* __HP_aCC */ +#endif /* __HP_aCC */ } int set_cancel_mode (void) diff --git a/ACE/examples/APG/ThreadManagement/State.cpp b/ACE/examples/APG/ThreadManagement/State.cpp index d95433440c7..f4934a2085b 100644 --- a/ACE/examples/APG/ThreadManagement/State.cpp +++ b/ACE/examples/APG/ThreadManagement/State.cpp @@ -19,8 +19,8 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Main Thread running\n"))); // Listing 1 code/ch13 HA_CommandHandler handler; - int result = handler.activate (THR_NEW_LWP | - THR_JOINABLE | + int result = handler.activate (THR_NEW_LWP | + THR_JOINABLE | THR_SUSPENDED); ACE_ASSERT (result == 0); @@ -34,6 +34,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) handler.grp_id ())); handler.resume (); handler.wait (); -// Listing 1 +// Listing 1 return 0; } diff --git a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp index 97c2539d3c5..06a054ee3fc 100644 --- a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp @@ -80,7 +80,7 @@ public: ACE_Message_Block *mb = 0; ACE_Time_Value tv ((long)MAX_TIMEOUT); tv += ACE_OS::time (0); - + // Get a message request. if (this->getq (mb, &tv) < 0) { diff --git a/ACE/examples/APG/Threads/Activate.cpp b/ACE/examples/APG/Threads/Activate.cpp index 2afa6316f91..658988a3bfa 100644 --- a/ACE/examples/APG/Threads/Activate.cpp +++ b/ACE/examples/APG/Threads/Activate.cpp @@ -24,7 +24,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) HA_CommandHandler handler; int result = handler.activate (); ACE_ASSERT (result == 0); - + ACE_UNUSED_ARG (result); handler.wait (); diff --git a/ACE/examples/APG/Timers/CB.cpp b/ACE/examples/APG/Timers/CB.cpp index 0a86ae7edeb..ba4a3f3a264 100644 --- a/ACE/examples/APG/Timers/CB.cpp +++ b/ACE/examples/APG/Timers/CB.cpp @@ -22,12 +22,12 @@ int CB::handle_timeout (const ACE_Time_Value &, if (count_ == 5) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reseting interval for timer %d\n"), timerID_)); // New interval is 10 ms. - ACE_Time_Value interval (0L, 1000L); + ACE_Time_Value interval (0L, 1000L); int status = Timer::instance ()->reset_interval (timerID_, interval); #if defined (ACE_NDEBUG) diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl index 87ff395c503..f6a109c05dc 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.inl +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.inl @@ -7,7 +7,7 @@ // inline, not ACE_INLINE. // FUZZ: disable check_for_inline -inline void +inline void Options::supplier_port (u_short port) { this->supplier_port_ = port; @@ -19,7 +19,7 @@ Options::supplier_port (void) return this->supplier_port_; } -inline void +inline void Options::consumer_port (u_short port) { this->consumer_port_ = port; @@ -55,55 +55,55 @@ Options::thr_count (void) return this->thr_count_; } -inline void +inline void Options::initial_queue_length (size_t length) { this->initial_queue_length_ = length; } -inline size_t +inline size_t Options::initial_queue_length (void) { return this->initial_queue_length_; } -inline void +inline void Options::high_water_mark (size_t size) { this->high_water_mark_ = size; } -inline size_t +inline size_t Options::high_water_mark (void) { return this->high_water_mark_; } -inline void +inline void Options::low_water_mark (size_t size) { this->low_water_mark_ = size; } -inline size_t +inline size_t Options::low_water_mark (void) { return this->low_water_mark_; } -inline void +inline void Options::message_size (size_t size) { this->message_size_ = size; } -inline size_t +inline size_t Options::message_size (void) { return this->message_size_; } -inline void +inline void Options::iterations (size_t n) { this->iterations_ = n; @@ -115,7 +115,7 @@ Options::iterations (void) return this->iterations_; } -inline void +inline void Options::t_flags (long flag) { this->t_flags_ |= flag; @@ -127,13 +127,13 @@ Options::t_flags (void) return this->t_flags_; } -inline int +inline int Options::debug (void) { return this->debugging_; } -inline int +inline int Options::verbose (void) { return this->verbosity_; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl index af04f73eb26..024e8d7f4d2 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.inl +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.inl @@ -8,7 +8,7 @@ // FUZZ: disable check_for_inline -inline void +inline void Options::supplier_port (const ACE_TCHAR *port) { this->supplier_port_ = port; @@ -20,7 +20,7 @@ Options::supplier_port (void) return this->supplier_port_; } -inline void +inline void Options::supplier_file (const ACE_TCHAR *file) { this->supplier_file_ = file; @@ -32,7 +32,7 @@ Options::supplier_file (void) return this->supplier_file_; } -inline void +inline void Options::consumer_file (const ACE_TCHAR *file) { this->consumer_file_ = file; @@ -44,7 +44,7 @@ Options::consumer_file (void) return this->consumer_file_; } -inline void +inline void Options::consumer_port (const ACE_TCHAR *port) { this->consumer_port_ = port; @@ -80,55 +80,55 @@ Options::thr_count (void) return this->thr_count_; } -inline void +inline void Options::initial_queue_length (size_t length) { this->initial_queue_length_ = length; } -inline size_t +inline size_t Options::initial_queue_length (void) { return this->initial_queue_length_; } -inline void +inline void Options::high_water_mark (size_t size) { this->high_water_mark_ = size; } -inline size_t +inline size_t Options::high_water_mark (void) { return this->high_water_mark_; } -inline void +inline void Options::low_water_mark (size_t size) { this->low_water_mark_ = size; } -inline size_t +inline size_t Options::low_water_mark (void) { return this->low_water_mark_; } -inline void +inline void Options::message_size (size_t size) { this->message_size_ = size; } -inline size_t +inline size_t Options::message_size (void) { return this->message_size_; } -inline void +inline void Options::iterations (size_t n) { this->iterations_ = n; @@ -140,7 +140,7 @@ Options::iterations (void) return this->iterations_; } -inline void +inline void Options::t_flags (long flag) { this->t_flags_ |= flag; @@ -152,13 +152,13 @@ Options::t_flags (void) return this->t_flags_; } -inline int +inline int Options::debug (void) { return this->debugging_; } -inline int +inline int Options::verbose (void) { return this->verbosity_; diff --git a/ACE/examples/C++NPv1/Logging_Handler.cpp b/ACE/examples/C++NPv1/Logging_Handler.cpp index f84e499349e..59d41280139 100644 --- a/ACE/examples/C++NPv1/Logging_Handler.cpp +++ b/ACE/examples/C++NPv1/Logging_Handler.cpp @@ -73,7 +73,7 @@ int Logging_Handler::recv_log_record (ACE_Message_Block *&mblk) return -1; } -int +int Logging_Handler::write_log_record (ACE_Message_Block *mblk) { // Peer hostname is in the <mblk> and the log record data diff --git a/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp index c11b1a30f1d..907771d354b 100644 --- a/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AC_Client_Logging_Daemon.cpp @@ -285,7 +285,7 @@ int AC_Input_Handler::handle_input (ACE_HANDLE handle) { mblk->release (); } } - + return -1; // Error return. } diff --git a/ACE/examples/C++NPv2/Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/Client_Logging_Daemon.cpp index 7bcc53ec84e..4ee83710607 100644 --- a/ACE/examples/C++NPv2/Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/Client_Logging_Daemon.cpp @@ -141,7 +141,7 @@ int CLD_Handler::handle_input (ACE_HANDLE handle) mblk->release (); } } - + return -1; // Error return. } @@ -237,7 +237,7 @@ int CLD_Handler::send (ACE_Message_Block *chunk[], size_t &count) { int CLD_Handler::close () { ACE_Message_Block *shutdown_message = 0; ACE_NEW_RETURN - (shutdown_message, + (shutdown_message, ACE_Message_Block (0, ACE_Message_Block::MB_STOP), -1); msg_queue_.enqueue_tail (shutdown_message); return thr_mgr_.wait (); @@ -292,7 +292,7 @@ int CLD_Connector::connect if (connector.connect (handler->peer (), remote_addr) == -1) return -1; - else if (handler->open (this) == -1) + else if (handler->open (this) == -1) { handler->handle_close (); return -1; } handler_ = handler; remote_addr_ = remote_addr; diff --git a/ACE/examples/C++NPv2/Logging_Acceptor.cpp b/ACE/examples/C++NPv2/Logging_Acceptor.cpp index 2e7b7479603..e76321d5002 100644 --- a/ACE/examples/C++NPv2/Logging_Acceptor.cpp +++ b/ACE/examples/C++NPv2/Logging_Acceptor.cpp @@ -30,9 +30,9 @@ int Logging_Acceptor::handle_input (ACE_HANDLE) { return 0; } -int Logging_Acceptor::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) { +int Logging_Acceptor::handle_close (ACE_HANDLE, + ACE_Reactor_Mask) { acceptor_.close (); delete this; - return 0; + return 0; } diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp index d805e776390..c0c47ac36ac 100644 --- a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp +++ b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp @@ -29,14 +29,14 @@ int Logging_Event_Handler::open () { O_RDWR|O_CREAT|O_APPEND, ACE_DEFAULT_FILE_PERMS); - return reactor ()->register_handler + return reactor ()->register_handler (this, ACE_Event_Handler::READ_MASK); } -int Logging_Event_Handler::handle_input (ACE_HANDLE) +int Logging_Event_Handler::handle_input (ACE_HANDLE) { return logging_handler_.log_record (); } -int Logging_Event_Handler::handle_close (ACE_HANDLE, +int Logging_Event_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { logging_handler_.close (); log_file_.close (); diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.cpp b/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.cpp index 858e615e9d9..4f5dc198d56 100644 --- a/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.cpp +++ b/ACE/examples/C++NPv2/Logging_Event_Handler_Ex.cpp @@ -17,7 +17,7 @@ int Logging_Event_Handler_Ex::open () { int result = PARENT::open (); if (result != -1) { ACE_Time_Value reschedule (max_client_timeout_.sec () / 4); - result = + result = reactor ()->schedule_timer (this, 0, @@ -34,7 +34,7 @@ int Logging_Event_Handler_Ex::handle_timeout return 0; } -int Logging_Event_Handler_Ex::handle_close (ACE_HANDLE, +int Logging_Event_Handler_Ex::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { reactor ()->cancel_timer (this); return PARENT::handle_close (); diff --git a/ACE/examples/C++NPv2/Logging_Handler.cpp b/ACE/examples/C++NPv2/Logging_Handler.cpp index 6fcce5c27de..2d8195d6398 100644 --- a/ACE/examples/C++NPv2/Logging_Handler.cpp +++ b/ACE/examples/C++NPv2/Logging_Handler.cpp @@ -81,7 +81,7 @@ int Logging_Handler::write_log_record (ACE_Message_Block *mblk) { return -1; } - + if (ACE::debug ()) { // Build a CDR stream from the log record data. @@ -98,7 +98,7 @@ int Logging_Handler::write_log_record (ACE_Message_Block *mblk) cdr >> log_record; // Finally extract the <ACE_log_record>. log_record.print (mblk->rd_ptr (), 1, cerr); } - + return ACE_Utils::truncate_cast<int> (mblk->total_length ()); } diff --git a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp index 85020d78bfc..0edaf876def 100644 --- a/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp +++ b/ACE/examples/C++NPv2/Reactor_Logging_Server_Adapter.cpp @@ -50,24 +50,24 @@ Reactor_Logging_Server_Adapter<ACCEPTOR>::info ACE_OS::sprintf (buf, ACE_TEXT ("%hu"), local_addr.get_port_number ()); - ACE_OS::strcat + ACE_OS::strcat (buf, ACE_TEXT ("/tcp # Reactor-based logging server\n")); if (*bufferp == 0) *bufferp = ACE::strnew (buf); else ACE_OS::strncpy (*bufferp, buf, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (*bufferp)); } template <class ACCEPTOR> int -Reactor_Logging_Server_Adapter<ACCEPTOR>::suspend () +Reactor_Logging_Server_Adapter<ACCEPTOR>::suspend () { return server_->reactor ()->suspend_handler (server_); } template <class ACCEPTOR> int -Reactor_Logging_Server_Adapter<ACCEPTOR>::resume () +Reactor_Logging_Server_Adapter<ACCEPTOR>::resume () { return server_->reactor ()->resume_handler (server_); } #endif /* _REACTOR_LOGGING_SERVER_ADAPTER_C */ diff --git a/ACE/examples/C++NPv2/Service_Reporter.cpp b/ACE/examples/C++NPv2/Service_Reporter.cpp index 0244d2ca573..797ef8989fd 100644 --- a/ACE/examples/C++NPv2/Service_Reporter.cpp +++ b/ACE/examples/C++NPv2/Service_Reporter.cpp @@ -51,23 +51,23 @@ int Service_Reporter::handle_input (ACE_HANDLE) { iterator.advance ()) { iovec iov[3]; iov[0].iov_base = const_cast<ACE_TCHAR *> (st->name ()); - + iov[0].iov_len = ACE_Utils::truncate_cast<u_long> ( ACE_OS::strlen (st->name ()) * sizeof (ACE_TCHAR)); - + const ACE_TCHAR *state = st->active () ? ACE_TEXT (" (active) ") : ACE_TEXT (" (paused) "); iov[1].iov_base = const_cast<ACE_TCHAR *> (state); - + iov[1].iov_len = ACE_Utils::truncate_cast<u_long> ( ACE_OS::strlen (state) * sizeof (ACE_TCHAR)); - + ACE_TCHAR *report = 0; // Ask info() to allocate buffer int len = st->type ()->info (&report, 0); iov[2].iov_base = static_cast<ACE_TCHAR *> (report); - + iov[2].iov_len = static_cast<u_long> (len); iov[2].iov_len *= sizeof (ACE_TCHAR); peer_stream.sendv_n (iov, 3); @@ -93,7 +93,7 @@ int Service_Reporter::info (ACE_TCHAR **bufferp, *bufferp = ACE::strnew (buf); else ACE_OS::strncpy (*bufferp, buf, length); - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (*bufferp)); } diff --git a/ACE/examples/C++NPv2/display_logfile.cpp b/ACE/examples/C++NPv2/display_logfile.cpp index 7eec2a55f57..4cf5d031109 100644 --- a/ACE/examples/C++NPv2/display_logfile.cpp +++ b/ACE/examples/C++NPv2/display_logfile.cpp @@ -281,8 +281,8 @@ public: ACE_TCHAR timestamp_t[26]; char timestamp[26]; // Max size of ctime_r() string. time_t time_secs (secs); - ACE_OS::ctime_r (&time_secs, - timestamp_t, + ACE_OS::ctime_r (&time_secs, + timestamp_t, sizeof timestamp_t / sizeof (ACE_TCHAR)); ACE_OS::strcpy (timestamp, ACE_TEXT_ALWAYS_CHAR (timestamp_t)); mblk->size (26); // Max size of ctime_r() string. diff --git a/ACE/examples/ConfigViewer/ConfigTreeCtrl.cpp b/ACE/examples/ConfigViewer/ConfigTreeCtrl.cpp index 7700272b9ba..60234c92537 100644 --- a/ACE/examples/ConfigViewer/ConfigTreeCtrl.cpp +++ b/ACE/examples/ConfigViewer/ConfigTreeCtrl.cpp @@ -65,7 +65,7 @@ void ConfigTreeCtrl::OnRightDown(wxMouseEvent& event) void ConfigTreeCtrl::OnRightUp(wxMouseEvent& event) { wxTreeItemId ItemID = GetSelection(); - + wxMenu* pMenu = new wxMenu; wxMenu* pNewMenu = new wxMenu; pNewMenu->Append(CFGNEWKEY, "Key"); @@ -127,7 +127,7 @@ void ConfigTreeCtrl::OnNewKey(wxCommandEvent& event) ACE_Configuration_Section_Key Key, NewKey; ResolveKey(ItemID, Key); m_pConfig->open_section(Key, Value, 1, NewKey); - wxTreeItemId NewItemID = AppendItem(ItemID, Value); + wxTreeItemId NewItemID = AppendItem(ItemID, Value); EnsureVisible(NewItemID); } diff --git a/ACE/examples/ConfigViewer/MainFrame.cpp b/ACE/examples/ConfigViewer/MainFrame.cpp index 6db44856160..eba0738a131 100644 --- a/ACE/examples/ConfigViewer/MainFrame.cpp +++ b/ACE/examples/ConfigViewer/MainFrame.cpp @@ -28,7 +28,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si m_pInstance = this; // Create a persistent heap based configuration - + ACE_Configuration_Heap* pHeapConfig = new ACE_Configuration_Heap; pHeapConfig->open(); m_pConfig = pHeapConfig; @@ -40,12 +40,12 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si m_pSplitter = new wxSplitterWindow(this, -1); wxSize sz( m_pSplitter->GetSize() ); sz.SetWidth(sz.GetWidth() / 2); - + // List Control m_pListCtrl = new ValueListCtrl(m_pSplitter, -1, wxDefaultPosition, sz); // Tree Control - m_pTreeCtrl = new ConfigTreeCtrl(m_pSplitter, FRAME_TREE, wxDefaultPosition, sz, + m_pTreeCtrl = new ConfigTreeCtrl(m_pSplitter, FRAME_TREE, wxDefaultPosition, sz, wxTR_EDIT_LABELS | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT); m_pTreeCtrl->SetpListCtrl(m_pListCtrl); @@ -54,7 +54,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si m_pSplitter->SplitVertically(m_pTreeCtrl, m_pListCtrl); m_pSplitter->SetMinimumPaneSize(100); m_pSplitter->SetSashPosition(size.GetWidth() / 3); - + // create a menu bar wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF); menuFile->Append(FILE_NEW_PERSISTENT_HEAP, "New Persistent Heap", "Create a new persistent heap"); diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.cpp b/ACE/examples/ConfigViewer/ValueListCtrl.cpp index 93c9af14fcb..1951aa93928 100644 --- a/ACE/examples/ConfigViewer/ValueListCtrl.cpp +++ b/ACE/examples/ConfigViewer/ValueListCtrl.cpp @@ -22,7 +22,7 @@ ValueListCtrl::ValueListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos InsertColumn(1, "Type"); InsertColumn(2, "Data"); } - + ValueListCtrl::~ValueListCtrl() { } @@ -137,7 +137,7 @@ void ValueListCtrl::OnModify(wxCommandEvent& event) Value = Dlg.GetUINTValue(); m_pConfig->set_integer_value(m_Key, Name, Value); - + } break; case ACE_Configuration::BINARY: @@ -163,7 +163,7 @@ void ValueListCtrl::OnDelete(wxCommandEvent& event) return ; } wxString Text = GetItemText(Item); - m_pConfig->remove_value(m_Key, Text); + m_pConfig->remove_value(m_Key, Text); DeleteItem(Item); } diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/run_test.sh b/ACE/examples/IPC_SAP/SOCK_SAP/run_test.sh index 7f0a4dbdaa7..bb7885fda57 100755 --- a/ACE/examples/IPC_SAP/SOCK_SAP/run_test.sh +++ b/ACE/examples/IPC_SAP/SOCK_SAP/run_test.sh @@ -9,7 +9,7 @@ user=`whoami` iterations=1000 if [ $# -ne 1 ]; then - echo $usage; + echo $usage; exit 1 fi threads=$1; diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp index 35512965832..084a6275c2a 100644 --- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp +++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp @@ -83,7 +83,7 @@ ACE_TMAIN (int /* argc */, ACE_TCHAR * /* argv */ []) STOP_PERIODIC_MONITORS; num_threads_monitor->remove_ref (); - + #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ return 0; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index d6ece4d563c..bac4fc1f2a5 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp @@ -133,7 +133,7 @@ Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd) ace_get_qos.receiving_flowspec ()->minimum_policed_size (), ace_get_qos.sending_flowspec ()->minimum_policed_size ())); - + return 0; } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index bc8e7860593..1293ec95182 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -212,7 +212,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) else ACE_DEBUG ((LM_DEBUG, "Setting QOS succeeds.\n")); - + // ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; // ACE_QoS_Session *qos_session_; diff --git a/ACE/examples/QOS/Diffserv/NOTES.txt b/ACE/examples/QOS/Diffserv/NOTES.txt index 4e73c66af0f..6f9432a7e6e 100644 --- a/ACE/examples/QOS/Diffserv/NOTES.txt +++ b/ACE/examples/QOS/Diffserv/NOTES.txt @@ -10,7 +10,7 @@ unless you run as root: EF, CS5, CS6, CS7 Also, under Linux 2.4.2 kernel, if I could successfully -set the 2 bits reserved for ECN in the Diffserv Field to +set the 2 bits reserved for ECN in the Diffserv Field to 0x00 or 0x02. However, the setsockopt call would fail if it was set to 0x01 or 0x03. @@ -41,7 +41,7 @@ On Fri, Oct 05, 2001 at 08:18:06AM +0300, Pekka Savola wrote: > =========================================================================== -FreeBSD notes +FreeBSD notes ============= Under FreeBSD 4.3, I encountered no problems setting DSCP or ECN values, and I could set all diff --git a/ACE/examples/Reactor/Proactor/test_aiocb.cpp b/ACE/examples/Reactor/Proactor/test_aiocb.cpp index 36a1d51062b..a5d266e47b4 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb.cpp @@ -10,12 +10,12 @@ // // = DESCRIPTION // Checkout $ACE_ROOT/examples/Reactor/Proactor/test_aiocb_ace.cpp, -// which is the ACE'ified version of this program. -// +// which is the ACE'ified version of this program. +// // = COMPILE and RUN // % CC -g -o test_aiocb -lrt test_aiocb.cpp // % ./test_aiocb -// +// // = AUTHOR // Alexander Babu Arulanthu <alex@cs.wustl.edu> // @@ -146,7 +146,7 @@ Test_Aio::do_aio (void) // the completion for the first one. if (aio_read (this->aiocb_read_) < 0) perror ("aio_read"); - + // Wait for the completion on aio_suspend. struct aiocb *list_aiocb[2]; list_aiocb [0] = this->aiocb_write_; @@ -214,7 +214,7 @@ Test_Aio::do_aio (void) cout << "Both the AIO operations done." << endl; cout << "The buffer is :" << this->buffer_read_ << endl; - + return 0; } @@ -229,11 +229,11 @@ main (int argc, char **argv) "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); return -1; } - + if (test_aio.do_aio () != 0) { printf ("AIOCB test failed:\n" - "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); + "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"); return -1; } printf ("AIOCB test successful:\n" diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl index 9b6e8772106..9060f535e28 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.inl @@ -50,7 +50,7 @@ Handle_Broadcast::info (ACE_TCHAR **strp, size_t length) const { ACE_OS::strncpy (*strp, buf, length); } - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (buf)); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl index 7b83f9a8f1f..5e45842714e 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.inl @@ -41,7 +41,7 @@ Handle_L_FIFO::info (ACE_TCHAR **strp, size_t length) const { ACE_OS::strncpy (*strp, buf, length); } - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (buf)); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl index f51deb326c8..2a9d9f84fdd 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl @@ -52,7 +52,7 @@ Handle_R_Stream::info (ACE_TCHAR **strp, size_t length) const { ACE_OS::strncpy (*strp, buf, length); } - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (buf)); } diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl index 5a9bed73c07..cd4d7336231 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.inl @@ -27,7 +27,7 @@ Handle_Timeout::info (ACE_TCHAR **strp, size_t length) const { ACE_OS::strncpy (*strp, buf, length); } - + return ACE_Utils::truncate_cast<int> (ACE_OS::strlen (buf)); } diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp index aeda00711bb..472e6d3e859 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp @@ -23,7 +23,7 @@ Gadget_Part_Impl::Gadget_Part_Impl (Gadget_ptr owner, { ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl constructor\n")); } - + Gadget_Part_Impl::~Gadget_Part_Impl (void) { ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl destructor\n")); diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp index 0e4e496f180..6e803c98cd5 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp @@ -23,7 +23,7 @@ Widget_Part_Impl::Widget_Part_Impl (Widget *owner, const char* name, int size) { ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl constructor\n")); } - + Widget_Part_Impl::~Widget_Part_Impl (void) { ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl destructor\n")); diff --git a/ACE/examples/Timer_Queue/Custom_Handler.cpp b/ACE/examples/Timer_Queue/Custom_Handler.cpp index ec79e6884cf..161f1fe4e3e 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.cpp +++ b/ACE/examples/Timer_Queue/Custom_Handler.cpp @@ -7,7 +7,7 @@ // Custom_Handler.cpp // // = DESCRIPTION -// This is a custom event handler to be used with the thread timer queue +// This is a custom event handler to be used with the thread timer queue // adapter, and its appropriate upcall. // // = AUTHOR diff --git a/ACE/performance-tests/SCTP/hist.cpp b/ACE/performance-tests/SCTP/hist.cpp index c67916a86cd..4bed955b422 100644 --- a/ACE/performance-tests/SCTP/hist.cpp +++ b/ACE/performance-tests/SCTP/hist.cpp @@ -170,7 +170,7 @@ void report_to(FILE *strm, hist_t *hist) { 2*hist->sum*mean + hist->num_points*mean*mean) / (hist->num_points-1); ACE_OS::fprintf(strm, "variance: %g\n", variance); - if (hist->skew) + if (hist->skew) { ACE_OS::fprintf(strm, "skew: %g\n", ((hist->sum3 - 3*hist->sum2*mean + @@ -189,7 +189,7 @@ void report_to(FILE *strm, hist_t *hist) { ACE_OS::fprintf(strm, "num_bins: %d %g %g\n", hist->num_bins,hist->first,hist->last); if (hist->firstoptheader) { trace = hist->firstoptheader; - while(trace->next != 0) + while(trace->next != 0) { ACE_OS::fprintf(strm, "%s: %s\n", trace->key, trace->value); trace = trace->next; @@ -219,7 +219,7 @@ void report_to(FILE *strm, hist_t *hist) { (double)hist->hs[hist->num_bins+1]/hist->num_points, (double)histfloor(1000.0*sofar/hist->num_points)/1000.0); - if (hist->num_outer) + if (hist->num_outer) { ACE_OS::fprintf(strm, "outliers:\n"); for(i = 0; i < hist->num_outer; i++) ACE_OS::fprintf(strm, "\t%12.3f\n", diff --git a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp index a59e247767b..1683b548b94 100644 --- a/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp +++ b/ACE/protocols/tests/HTBP/Send_Large_Msg/server.cpp @@ -11,7 +11,7 @@ #include "ace/SOCK_Stream.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_socket.h" -#include "ace/os_include/os_netdb.h" +#include "ace/os_include/os_netdb.h" const size_t Send_Size = 4*1024; const size_t Loops = 10; diff --git a/ACE/protocols/tests/HTBP/ping/client.cpp b/ACE/protocols/tests/HTBP/ping/client.cpp index 8f442e18cbb..d89131ee8a9 100644 --- a/ACE/protocols/tests/HTBP/ping/client.cpp +++ b/ACE/protocols/tests/HTBP/ping/client.cpp @@ -8,7 +8,7 @@ #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_socket.h" -#include "ace/os_include/os_netdb.h" +#include "ace/os_include/os_netdb.h" #include "ace/HTBP/HTBP_Session.h" #include "ace/HTBP/HTBP_Stream.h" diff --git a/ACE/tests/Compiler_Features_13_Test.cpp b/ACE/tests/Compiler_Features_13_Test.cpp index 32934dda76d..f082b855c27 100644 --- a/ACE/tests/Compiler_Features_13_Test.cpp +++ b/ACE/tests/Compiler_Features_13_Test.cpp @@ -91,7 +91,7 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT("Wrong value after dynamic_cast, expected %d, got %d\n"), 42, d.value)); } - + // Make sure dynamic cast detects invalid casts Another a; Base * b2 = &a; diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index 97f08a10d03..e171f9af269 100644 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp @@ -117,7 +117,7 @@ sizeof_from_lt_sizeof_to (void) success ? ACE_TEXT ("PASSED") : ACE_TEXT ("FAILED"))); - + return success; } @@ -353,7 +353,7 @@ int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Integer_Truncate_Test")); - + typedef bool (*test_func) (); static test_func const tests[] = diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index e5752a690f7..dcdcf407192 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -637,7 +637,7 @@ test_format_specs (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%#T\n"), &tv)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("thread id %t\n"))); - + Log_Spec_Verify verifier; ACE_LOG_MSG->msg_callback (&verifier); diff --git a/ACE/tests/Memcpy_Test.cpp b/ACE/tests/Memcpy_Test.cpp index 46fb2c381e5..d2dd7501777 100644 --- a/ACE/tests/Memcpy_Test.cpp +++ b/ACE/tests/Memcpy_Test.cpp @@ -9,7 +9,7 @@ * This test compares the performance of ACE_OS::memcpy with * that of smemcpy which unrolls the memcpy loop upto size = 16. * This test is also run via autoconf and if smemcpy is faster, - * ACE_HAS_MEMCPY_LOOP_UNROLL flag is set. + * ACE_HAS_MEMCPY_LOOP_UNROLL flag is set. * */ //============================================================================= @@ -53,7 +53,7 @@ testit (int type) char buffer[16]; size_t size = 16; - switch (type) + switch (type) { case 0: smemcpy ((void*)buffer, (void*)" THIS IS A TEST", size); break; case 1: ACE_OS::memcpy ((void*)buffer, (void*)" THIS IS A TEST", size); break; @@ -71,11 +71,11 @@ run_main (int, ACE_TCHAR *[]) //ACE_Time_Value start, now; struct timeval start, now; - for (int i = ITERATIONS; i > 0; --i) + for (int i = ITERATIONS; i > 0; --i) testit (0); start = ACE_High_Res_Timer::gettimeofday_hr (); - for (int j = ITERATIONS; j > 0; --j) + for (int j = ITERATIONS; j > 0; --j) testit (0); now = ACE_High_Res_Timer::gettimeofday_hr (); @@ -87,7 +87,7 @@ run_main (int, ACE_TCHAR *[]) fast / ITERATIONS)); start = ACE_High_Res_Timer::gettimeofday_hr (); - for (int k = ITERATIONS; k > 0; --k) + for (int k = ITERATIONS; k > 0; --k) testit (1); now = ACE_High_Res_Timer::gettimeofday_hr (); diff --git a/ACE/tests/Missing_Svc_Conf_Test.cpp b/ACE/tests/Missing_Svc_Conf_Test.cpp index 152ce9e48ce..2780b26f587 100644 --- a/ACE/tests/Missing_Svc_Conf_Test.cpp +++ b/ACE/tests/Missing_Svc_Conf_Test.cpp @@ -1,7 +1,7 @@ // $Id$ // ========================================================================== -// +// // = LIBRARY // tests // @@ -53,15 +53,15 @@ run_main (int, ACE_TCHAR *[] ) if (result != -1 || errno != ENOENT) { ++failcount; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ERROR: did not get expected ENOENT, %p\n"), ACE_TEXT("ACE_Service_Config::open"))); } else - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Success: defaulted Service_Config::open ") ACE_TEXT("with missing file got expected ENOENT\n"))); - + result = ACE_Service_Config::close(); if (result != 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), @@ -75,13 +75,13 @@ run_main (int, ACE_TCHAR *[] ) if (result != 0) { ++failcount; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("ERROR: missing svc.conf with ") ACE_TEXT("command line directive, %p\n"), ACE_TEXT("ACE_Service_Config::open"))); } else - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Success: Service_Config::open with command line ") ACE_TEXT("directive ignored missing svc.conf\n"))); diff --git a/ACE/tests/run_tests_remote.sh b/ACE/tests/run_tests_remote.sh index 149a9174d92..39fed72b786 100755 --- a/ACE/tests/run_tests_remote.sh +++ b/ACE/tests/run_tests_remote.sh @@ -2,7 +2,7 @@ # $Id$ # # This is the UNIX version of the one-button ACE tests. -# Contributed originally by Michael Rueger <m_rueger@SYSCOMP.DE> and +# Contributed originally by Michael Rueger <m_rueger@SYSCOMP.DE> and # modified substantially by the DOC group. # # It also supports remote invocation on a CHORUS/ClassiX/MVME target. @@ -213,7 +213,7 @@ for i in `cat run_tests_remote.lst | tr "\012" "$IFS"`; do test=$i; ;; esac - + # echo =****= $precond ===== $test; if test -z "$precond"; then |