Mon Jan 29 19:48:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 21 insertions, 33 deletions

diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 74ea8994c6d..a76d3dbcbd3 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -23,7 +23,7 @@ class ACE_Based_Pointer_Repository_Rep
 public:
   // Useful typedefs.
   typedef ACE_Map_Manager <void *, size_t, ACE_Null_Mutex> MAP_MANAGER;
-  typedef ACE_Map_Iterator < void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
+  typedef ACE_Map_Iterator <void *, size_t, ACE_Null_Mutex> MAP_ITERATOR;
   typedef ACE_Map_Entry <void *, size_t> MAP_ENTRY;
 
   /// Keeps track of the mapping between addresses and their associated
@@ -50,8 +50,7 @@ ACE_Based_Pointer_Repository::~ACE_Based_Pointer_Repository (void)
 // Search for appropriate base address in repository
 
 int
-ACE_Based_Pointer_Repository::find (void *addr,
-                                    void *&base_addr)
+ACE_Based_Pointer_Repository::find (void *addr, void *&base_addr)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::find");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -62,7 +61,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
        iter.advance ())
     // Check to see if <addr> is within any of the regions.
     if (addr >= ce->ext_id_
-        && addr < ((char *) ce->ext_id_ + ce->int_id_))
+        && addr < ((char *)ce->ext_id_ + ce->int_id_))
       {
         // Assign the base address.
         base_addr = ce->ext_id_;
@@ -78,8 +77,7 @@ ACE_Based_Pointer_Repository::find (void *addr,
 // existing entry.
 
 int
-ACE_Based_Pointer_Repository::bind (void *addr,
-                                    size_t size)
+ACE_Based_Pointer_Repository::bind (void *addr, size_t size)
 {
   ACE_TRACE ("ACE_Based_Pointer_Repository::bind");
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->rep_->lock_, -1);
@@ -105,7 +103,7 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
       // Check to see if <addr> is within any of the regions and if
       // so, unbind the key from the map.
       if (addr >= ce->ext_id_
-          && addr < ((char *) ce->ext_id_ + ce->int_id_))
+          && addr < ((char *)ce->ext_id_ + ce->int_id_))
         // Unbind base address.
         return this->rep_->addr_map_.unbind (ce->ext_id_);
     }
diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp
index 0f00f5b7332..cfe8ca320b0 100644
--- a/ACE/ace/Basic_Stats.cpp
+++ b/ACE/ace/Basic_Stats.cpp
@@ -46,8 +46,7 @@ ACE_Basic_Stats::accumulate (const ACE_Basic_Stats &rhs)
 }
 
 void
-ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg,
-                               ACE_UINT32 sf) const
+ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const
 {
 #ifndef ACE_NLOGGING
   if (this->samples_count () == 0u)
diff --git a/ACE/ace/Codeset_Registry.cpp b/ACE/ace/Codeset_Registry.cpp
index 5d3c6abb59b..b98a1dd7e89 100644
--- a/ACE/ace/Codeset_Registry.cpp
+++ b/ACE/ace/Codeset_Registry.cpp
@@ -33,9 +33,9 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
-    if (ACE_OS::strcmp(registry_db_[i].loc_name_,locale.c_str()) == 0)
+    if (ACE_OS::strcmp (registry_db_[i].loc_name_, locale.c_str ()) == 0)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
@@ -45,8 +45,7 @@ ACE_Codeset_Registry::locale_to_registry_i (const ACE_CString &locale,
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -58,20 +57,19 @@ ACE_Codeset_Registry::registry_to_locale_i (ACE_CDR::ULong codeset_id,
                                             ACE_CDR::UShort *num_sets,
                                             ACE_CDR::UShort **char_sets)
 {
-  registry_entry const * element = 0;
+  registry_entry const *element = 0;
   for (size_t i = 0; element == 0 && i < num_registry_entries_; i++)
     if (codeset_id == registry_db_[i].codeset_id_)
       element = &registry_db_[i];
   if (element == 0)
     return 0;
-  locale.set(element->loc_name_);
+  locale.set (element->loc_name_);
   if (num_sets != 0)
     *num_sets = element->num_sets_;
   if (char_sets != 0)
     {
       ACE_NEW_RETURN (*char_sets,ACE_CDR::UShort[element->num_sets_],0);
-      ACE_OS::memcpy (*char_sets,
-                      element->char_sets_,
+      ACE_OS::memcpy (*char_sets, element->char_sets_,
                       element->num_sets_ * sizeof (ACE_CDR::UShort));
     }
   return 1;
@@ -81,8 +79,8 @@ int
 ACE_Codeset_Registry::is_compatible_i (ACE_CDR::ULong codeset_id,
                                        ACE_CDR::ULong other)
 {
-  registry_entry const * lhs = 0;
-  registry_entry const * rhs = 0;
+  registry_entry const *lhs = 0;
+  registry_entry const *rhs = 0;
   for (size_t i = 0; (lhs == 0 || rhs == 0) && i < num_registry_entries_; i++)
     {
       if (codeset_id == registry_db_[i].codeset_id_)
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index 91ed5511e08..93fa7e417cd 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -57,8 +57,7 @@ ACE_FILE::get_info (ACE_FILE_Info *finfo)
   ACE_TRACE ("ACE_FILE::get_info");
   ACE_stat filestatus;
 
-  int const result = ACE_OS::fstat (this->get_handle (),
-                                    &filestatus);
+  int const result = ACE_OS::fstat (this->get_handle (), &filestatus);
 
   if (result == 0)
     {
@@ -82,15 +81,13 @@ int
 ACE_FILE::truncate (ACE_OFF_T length)
 {
   ACE_TRACE ("ACE_FILE::truncate");
-  return ACE_OS::ftruncate (this->get_handle(), length);
+  return ACE_OS::ftruncate (this->get_handle (), length);
 }
 
 ACE_OFF_T
 ACE_FILE::seek (ACE_OFF_T offset, int startpos)
 {
-  return ACE_OS::lseek (this->get_handle (),
-                        offset,
-                        startpos);
+  return ACE_OS::lseek (this->get_handle (), offset, startpos);
 }
 
 ACE_OFF_T
diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp
index 09d87c0d9b1..79d92c49ad9 100644
--- a/ACE/ace/FILE_Addr.cpp
+++ b/ACE/ace/FILE_Addr.cpp
@@ -33,8 +33,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
       ACE_OS::strcpy (this->filename_,
                       ACE_DEFAULT_TEMP_FILE);
 #else /* ACE_DEFAULT_TEMP_FILE */
-      if (ACE::get_temp_dir (this->filename_,
-                                      MAXPATHLEN - 15) == -1)
+      if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 15) == -1)
         // -15 for ace-file-XXXXXX
         {
           ACE_ERROR ((LM_ERROR,
@@ -55,12 +54,9 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
     }
   else
     {
-      (void) ACE_OS::strsncpy (this->filename_,
-                               sa.filename_,
-                               sa.get_size ());
+      (void)ACE_OS::strsncpy (this->filename_, sa.filename_, sa.get_size ());
 
-      this->base_set (sa.get_type (),
-                      sa.get_size ());
+      this->base_set (sa.get_type (), sa.get_size ());
     }
   return 0;
 }
@@ -111,7 +107,7 @@ ACE_FILE_Addr::addr_to_string (ACE_TCHAR *s, size_t len) const
 void *
 ACE_FILE_Addr::get_addr (void) const
 {
-  return (void *) &this->filename_;
+  return (void *)&this->filename_;
 }
 
 void