Tue May 29 07:07:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

17 files changed, 71 insertions, 47 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c45b882382e..351905888c0 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,30 @@
+Tue May 29 07:07:55 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/FILE.cpp:
+          Removed first line
+
+        * ace/Log_Msg.cpp:
+          Declare and initialize a variable in one step
+
+        * ace/Mem_Map.cpp:
+          Small simplification
+
+        * ace/Semaphore.{h,cpp,inl}:
+          Made removed_ a real bool
+
+        * ace/Shared_Memory.h:
+          Changed get_segment_size to return size_t
+
+        * ace/Shared_Memory_MM.{h,cpp,inl}:
+        * ace/Shared_Memory_SV.{h,cpp,inl}:
+          Changed get_segment_size and length to size_t
+
+        * ace/SV_Semaphore_Simple.cpp:
+          Const improvement
+
+        * ace/SV_Shared_Memory.{h,inl}:
+          Layout changes
+
 Mon May 28 19:42:14 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * netsvcs/lib/Server_Logging_Handler_T.cpp:
diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp
index 93fa7e417cd..8b3015524e3 100644
--- a/ACE/ace/FILE.cpp
+++ b/ACE/ace/FILE.cpp
@@ -1,4 +1,3 @@
-// FILE.cpp
 // $Id$
 
 /* Defines the member functions for the base class of the ACE_IO_SAP
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 857fff8699f..d709ff64b70 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1267,8 +1267,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
                 case 'p':             // <errno> string, ala perror()
                   {
                     errno = 0;
-                    char *msg = 0;
-                    msg = ACE_OS::strerror (ACE::map_errno (this->errnum ()));
+                    char *msg = ACE_OS::strerror (ACE::map_errno (this->errnum ()));
                     // Windows can try to translate the errnum using
                     // system calls if strerror() doesn't get anything useful.
 #if defined (ACE_WIN32)
diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp
index 492fcb70c89..19348661c09 100644
--- a/ACE/ace/Mem_Map.cpp
+++ b/ACE/ace/Mem_Map.cpp
@@ -90,8 +90,10 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
 
   // Check <length_request>
   if (length_request == static_cast<size_t> (-1))
-    // Set length to file_request or size_t max.
-    this->length_ = ACE_Utils::truncate_cast<size_t> (current_file_length - offset);
+    {
+      // Set length to file_request or size_t max.
+      this->length_ = ACE_Utils::truncate_cast<size_t> (current_file_length - offset);
+    }
   else
     {
       // Make sure that we have not been asked to do the impossible.
@@ -124,13 +126,12 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle,
   if (extend_backing_store)
     {
       // Remember than write increases the size by one.
-      ACE_OFF_T null_byte_position;
+      ACE_OFF_T null_byte_position = 0;
       if (requested_file_length > 0)
-        // This will make the file size <requested_file_length>
-        null_byte_position = requested_file_length - 1;
-      else
-        // This will make the file size 1
-        null_byte_position = 0;
+        {
+          // This will make the file size <requested_file_length>
+          null_byte_position = requested_file_length - 1;
+        }
 
       if (ACE_OS::pwrite (this->handle_,
                           "",
diff --git a/ACE/ace/SV_Semaphore_Simple.cpp b/ACE/ace/SV_Semaphore_Simple.cpp
index 42fac9be0c7..62d67f96260 100644
--- a/ACE/ace/SV_Semaphore_Simple.cpp
+++ b/ACE/ace/SV_Semaphore_Simple.cpp
@@ -229,7 +229,7 @@ int
 ACE_SV_Semaphore_Simple::remove (void) const
 {
   ACE_TRACE ("ACE_SV_Semaphore_Simple::remove");
-  int result = this->control (IPC_RMID);
+  int const result = this->control (IPC_RMID);
   ((ACE_SV_Semaphore_Simple *) this)->init ();
   return result;
 }
diff --git a/ACE/ace/SV_Shared_Memory.h b/ACE/ace/SV_Shared_Memory.h
index d9da2ad9f39..2b0c7dcb254 100644
--- a/ACE/ace/SV_Shared_Memory.h
+++ b/ACE/ace/SV_Shared_Memory.h
@@ -66,8 +66,7 @@ public:
                         int flags = 0);
 
   /// Attach this shared memory segment.
-  int  attach (void *virtual_addr = 0,
-               int flags =0);
+  int  attach (void *virtual_addr = 0, int flags = 0);
 
   /// Detach this shared memory segment.
   int  detach (void);
diff --git a/ACE/ace/SV_Shared_Memory.inl b/ACE/ace/SV_Shared_Memory.inl
index 3aaa41414e0..8ca16d52e47 100644
--- a/ACE/ace/SV_Shared_Memory.inl
+++ b/ACE/ace/SV_Shared_Memory.inl
@@ -23,10 +23,10 @@ ACE_SV_Shared_Memory::open (key_t external_id, size_t sz, int create, int perms)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::open");
 #if defined (ACE_WIN32)
-        ACE_UNUSED_ARG(perms);
-        ACE_UNUSED_ARG(create);
-        ACE_UNUSED_ARG(sz);
-        ACE_UNUSED_ARG(external_id);
+  ACE_UNUSED_ARG(perms);
+  ACE_UNUSED_ARG(create);
+  ACE_UNUSED_ARG(sz);
+  ACE_UNUSED_ARG(external_id);
   ACE_NOTSUP_RETURN (-1);
 #else
   this->segment_ptr_ = 0;
@@ -45,8 +45,8 @@ ACE_SV_Shared_Memory::attach (void *virtual_addr, int flags)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::attach");
 #if defined (ACE_WIN32)
-        ACE_UNUSED_ARG(flags);
-        ACE_UNUSED_ARG(virtual_addr);
+  ACE_UNUSED_ARG(flags);
+  ACE_UNUSED_ARG(virtual_addr);
   ACE_NOTSUP_RETURN (-1);
 #else
   this->segment_ptr_ = ACE_OS::shmat (this->internal_id_, virtual_addr, flags);
@@ -61,10 +61,9 @@ ACE_SV_Shared_Memory::control (int cmd, void *buf)
 {
   ACE_TRACE ("ACE_SV_Shared_Memory::control");
 #if defined (ACE_WIN32)
-        ACE_UNUSED_ARG(cmd);
-        ACE_UNUSED_ARG(buf);
-
-        ACE_NOTSUP_RETURN (-1);
+  ACE_UNUSED_ARG(cmd);
+  ACE_UNUSED_ARG(buf);
+  ACE_NOTSUP_RETURN (-1);
 #else
   return ACE_OS::shmctl (this->internal_id_, cmd, (struct shmid_ds *) buf);
 #endif /* ACE_WIN32 */
diff --git a/ACE/ace/Semaphore.cpp b/ACE/ace/Semaphore.cpp
index 3a48bd38168..69e247306e4 100644
--- a/ACE/ace/Semaphore.cpp
+++ b/ACE/ace/Semaphore.cpp
@@ -32,7 +32,7 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count,
                               const ACE_TCHAR *name,
                               void *arg,
                               int max)
-  : removed_ (0)
+  : removed_ (false)
 {
 // ACE_TRACE ("ACE_Semaphore::ACE_Semaphore");
 #if defined(ACE_LACKS_UNNAMED_SEMAPHORE)
diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h
index 96064adfdd1..1fb8c5fa2f3 100644
--- a/ACE/ace/Semaphore.h
+++ b/ACE/ace/Semaphore.h
@@ -165,7 +165,7 @@ protected:
   /// destructor.  This flag isn't protected by a lock, so make sure
   /// that you don't have multiple threads simultaneously calling
   /// <remove> on the same object, which is a bad idea anyway...
-  int removed_;
+  bool removed_;
 
 private:
   // = Prevent assignment and initialization.
diff --git a/ACE/ace/Semaphore.inl b/ACE/ace/Semaphore.inl
index 8bfe49ce39c..238117585ac 100644
--- a/ACE/ace/Semaphore.inl
+++ b/ACE/ace/Semaphore.inl
@@ -16,9 +16,9 @@ ACE_Semaphore::remove (void)
 {
 // ACE_TRACE ("ACE_Semaphore::remove");
   int result = 0;
-  if (this->removed_ == 0)
+  if (!this->removed_)
     {
-      this->removed_ = 1;
+      this->removed_ = true;
       result = ACE_OS::sema_destroy (&this->semaphore_);
     }
   return result;
diff --git a/ACE/ace/Shared_Memory.h b/ACE/ace/Shared_Memory.h
index cb3378c9c08..9fc64a23036 100644
--- a/ACE/ace/Shared_Memory.h
+++ b/ACE/ace/Shared_Memory.h
@@ -47,7 +47,7 @@ public:
   virtual int remove (void) = 0;
   virtual void *malloc (size_t = 0) = 0;
   virtual int free (void *p) = 0;
-  virtual int get_segment_size (void) const = 0;
+  virtual size_t get_segment_size (void) const = 0;
   virtual ACE_HANDLE get_id (void) const = 0;
 };
 
diff --git a/ACE/ace/Shared_Memory_MM.cpp b/ACE/ace/Shared_Memory_MM.cpp
index 0662e7525bd..ae3285939d1 100644
--- a/ACE/ace/Shared_Memory_MM.cpp
+++ b/ACE/ace/Shared_Memory_MM.cpp
@@ -26,7 +26,7 @@ ACE_Shared_Memory_MM::dump (void) const
 // Creates a shared memory segment of SIZE bytes.
 
 ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (ACE_HANDLE handle,
-                                            int length,
+                                            size_t length,
                                             int prot,
                                             int share,
                                             char *addr,
@@ -37,7 +37,7 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (ACE_HANDLE handle,
 }
 
 ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (const ACE_TCHAR *file_name,
-                                            int len,
+                                            size_t len,
                                             int flags,
                                             int mode,
                                             int prot,
@@ -59,12 +59,12 @@ ACE_Shared_Memory_MM::ACE_Shared_Memory_MM (void)
 
 // The overall size of the segment.
 
-int
+size_t
 ACE_Shared_Memory_MM::get_segment_size (void) const
 {
   ACE_TRACE ("ACE_Shared_Memory_MM::get_segment_size");
   // This cast is legit since the original length in open() is an int.
-  return static_cast<int> (this->shared_memory_.size ());
+  return this->shared_memory_.size ();
 }
 
 // Unmaps the shared memory segment.
diff --git a/ACE/ace/Shared_Memory_MM.h b/ACE/ace/Shared_Memory_MM.h
index 25f173a2afe..e23ac00cdbf 100644
--- a/ACE/ace/Shared_Memory_MM.h
+++ b/ACE/ace/Shared_Memory_MM.h
@@ -43,7 +43,7 @@ public:
 
   /// Constructor.
   ACE_Shared_Memory_MM (ACE_HANDLE handle,
-                        int length = -1,
+                        size_t length = static_cast<size_t> (-1),
                         int prot = PROT_RDWR,
                         int share = ACE_MAP_PRIVATE,
                         char *addr = 0,
@@ -51,7 +51,7 @@ public:
 
   /// Constructor.
   ACE_Shared_Memory_MM (const ACE_TCHAR *file_name,
-                        int len = -1,
+                        size_t length = static_cast<size_t> (-1),
                         int flags = O_RDWR | O_CREAT,
                         int mode = ACE_DEFAULT_FILE_PERMS,
                         int prot = PROT_RDWR,
@@ -60,7 +60,7 @@ public:
 
   /// Open method.
   int open (ACE_HANDLE handle,
-            int length = -1,
+            size_t length = static_cast<size_t> (-1),
             int prot = PROT_RDWR,
             int share = ACE_MAP_PRIVATE,
             char *addr = 0,
@@ -68,7 +68,7 @@ public:
 
   /// Open method.
   int open (const ACE_TCHAR *file_name,
-            int len = -1,
+            size_t length = static_cast<size_t> (-1),
             int flags = O_RDWR | O_CREAT,
             int mode = ACE_DEFAULT_FILE_PERMS,
             int prot = PROT_RDWR,
@@ -94,7 +94,7 @@ public:
   virtual int free (void *p);
 
   /// Return the size of the shared memory segment.
-  virtual int get_segment_size (void) const;
+  virtual size_t get_segment_size (void) const;
 
   /// Return the ID of the shared memory segment (i.e., an ACE_HANDLE).
   virtual ACE_HANDLE get_id (void) const;
diff --git a/ACE/ace/Shared_Memory_MM.inl b/ACE/ace/Shared_Memory_MM.inl
index 6d1e653cc17..4f6890d9270 100644
--- a/ACE/ace/Shared_Memory_MM.inl
+++ b/ACE/ace/Shared_Memory_MM.inl
@@ -14,7 +14,7 @@ ACE_Shared_Memory_MM::filename (void) const
 
 ACE_INLINE int
 ACE_Shared_Memory_MM::open (ACE_HANDLE handle,
-                            int length,
+                            size_t length,
                             int prot,
                             int share,
                             char *addr,
@@ -26,7 +26,7 @@ ACE_Shared_Memory_MM::open (ACE_HANDLE handle,
 
 ACE_INLINE int
 ACE_Shared_Memory_MM::open (const ACE_TCHAR *file_name,
-                            int len,
+                            size_t len,
                             int flags,
                             int mode,
                             int prot,
diff --git a/ACE/ace/Shared_Memory_SV.cpp b/ACE/ace/Shared_Memory_SV.cpp
index 8378b75d7dc..e16b181408e 100644
--- a/ACE/ace/Shared_Memory_SV.cpp
+++ b/ACE/ace/Shared_Memory_SV.cpp
@@ -25,7 +25,7 @@ ACE_Shared_Memory_SV::dump (void) const
 }
 
 ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
-                                            int length,
+                                            size_t length,
                                             int create,
                                             int perms,
                                             void *addr,
@@ -37,13 +37,13 @@ ACE_Shared_Memory_SV::ACE_Shared_Memory_SV (key_t id,
 
 // The overall size of the segment.
 
-int
+size_t
 ACE_Shared_Memory_SV::get_segment_size (void) const
 {
   ACE_TRACE ("ACE_Shared_Memory_SV::get_segment_size");
   // This cast is ok since the 'open' method for this class allows only
   // an 'int' size. Therefore, this case should not lose information.
-  return static_cast<int> (this->shared_memory_.get_segment_size ());
+  return this->shared_memory_.get_segment_size ();
 }
 
 // Removes the shared memory segment.
diff --git a/ACE/ace/Shared_Memory_SV.h b/ACE/ace/Shared_Memory_SV.h
index f9097f0b4eb..517d72c33dc 100644
--- a/ACE/ace/Shared_Memory_SV.h
+++ b/ACE/ace/Shared_Memory_SV.h
@@ -46,14 +46,14 @@ public:
   // = Initialization and termination methods.
   ACE_Shared_Memory_SV (void);
   ACE_Shared_Memory_SV (key_t id,
-                        int length,
+                        size_t length,
                         int create = ACE_Shared_Memory_SV::ACE_OPEN,
                         int perms = ACE_DEFAULT_FILE_PERMS,
                         void *addr = 0,
                         int flags = 0);
 
   int open (key_t id,
-            int length,
+            size_t length,
             int create = ACE_Shared_Memory_SV::ACE_OPEN,
             int perms = ACE_DEFAULT_FILE_PERMS,
             void *addr = 0,
@@ -73,7 +73,7 @@ public:
   virtual int free (void *p);
 
   /// Return the size of the shared memory segment.
-  virtual int get_segment_size (void) const;
+  virtual size_t get_segment_size (void) const;
 
   /// Return the ID of the shared memory segment (i.e., a System V
   /// shared memory internal id).
diff --git a/ACE/ace/Shared_Memory_SV.inl b/ACE/ace/Shared_Memory_SV.inl
index f40fc55c28d..71f417f8848 100644
--- a/ACE/ace/Shared_Memory_SV.inl
+++ b/ACE/ace/Shared_Memory_SV.inl
@@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 ACE_Shared_Memory_SV::open (key_t id,
-                            int length,
+                            size_t length,
                             int create,
                             int perms,
                             void *addr,