Code polishing, s/mySharedSize/sharedSize/ for consistency.

diff --git a/src/ipc/Queue.cc b/src/ipc/Queue.cc
index d7b326953989943d2b762c6a25d329ae794a2c82..c09331909f3a3e294a7fd5a37a8da8b0e57e69ec 100644 (file)
--- a/src/ipc/Queue.cc
+++ b/src/ipc/Queue.cc
@@ -55,9 +55,9 @@ OneToOneUniQueue::OneToOneUniQueue(const String &id): shm(id.termedBuf()),
     shm.open();
     shared = reinterpret_cast<Shared *>(shm.mem());
     assert(shared);
-    const int mySharedSize =
+    const int sharedSize =
         Items2Bytes(shared->theMaxItemSize, shared->theCapacity);
-    assert(shared == reinterpret_cast<Shared *>(shm.reserve(mySharedSize)));
+    assert(shared == reinterpret_cast<Shared *>(shm.reserve(sharedSize)));
 }
 
 void

diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index 36763d215a1a7a4308f4cd10f8ac062b43ca8c00..1b332802bef4b731f80523b32ff6f35b7b41aa1f 100644 (file)
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -14,9 +14,9 @@ Ipc::StoreMap::StoreMap(const char *const aPath, const int limit,
     cleaner(NULL), path(aPath), shm(aPath), shared(NULL)
 {
     assert(limit > 0); // we should not be created otherwise
-    const size_t mySharedSize = Shared::MemSize(limit);
-    shm.create(mySharedSize + sharedSizeExtra);
-    shared = new (shm.reserve(mySharedSize)) Shared(limit);
+    const size_t sharedSize = Shared::MemSize(limit);
+    shm.create(sharedSize + sharedSizeExtra);
+    shared = new (shm.reserve(sharedSize)) Shared(limit);
     debugs(54, 5, HERE << "new map [" << path << "] created: " << limit);
 }
 
@@ -28,7 +28,8 @@ Ipc::StoreMap::StoreMap(const char *const aPath):
     shared = reinterpret_cast<Shared *>(shm.mem());
     assert(shared->limit > 0); // we should not be created otherwise
     // now that the limit is checked, check that nobody used our segment chunk
-    assert(shared == reinterpret_cast<Shared *>(shm.reserve(Shared::MemSize(shared->limit))));
+    const size_t sharedSize = Shared::MemSize(shared->limit);
+    assert(shared == reinterpret_cast<Shared *>(shm.reserve(sharedSize)));
     debugs(54, 5, HERE << "attached map [" << path << "] created: " << shared->limit);
 }
 

diff --git a/src/ipc/mem/PagePool.cc b/src/ipc/mem/PagePool.cc
index 27c4793a3680975fc423504d5b28fe49b4288a23..9885daf19bd08163bd67a359556de26097c41dfe 100644 (file)
--- a/src/ipc/mem/PagePool.cc
+++ b/src/ipc/mem/PagePool.cc
@@ -25,10 +25,10 @@ Ipc::Mem::PagePool::PagePool(const String &id, const unsigned int capacity, cons
     pageIndex(PageIndexId(id), capacity),
     shm(id.termedBuf())
 {
-    const off_t mySharedSize = Shared::MemSize(capacity, pageSize);
-    shm.create(mySharedSize);
+    const off_t sharedSize = Shared::MemSize(capacity, pageSize);
+    shm.create(sharedSize);
     assert(shm.mem());
-    shared = new (shm.reserve(mySharedSize)) Shared(capacity, pageSize);
+    shared = new (shm.reserve(sharedSize)) Shared(capacity, pageSize);
 }
 
 Ipc::Mem::PagePool::PagePool(const String &id):
@@ -37,9 +37,9 @@ Ipc::Mem::PagePool::PagePool(const String &id):
     shm.open();
     shared = reinterpret_cast<Shared *>(shm.mem());
     assert(shared);
-    const off_t mySharedSize =
+    const off_t sharedSize =
         Shared::MemSize(shared->theCapacity, shared->thePageSize);
-    assert(shared == reinterpret_cast<Shared *>(shm.reserve(mySharedSize)));
+    assert(shared == reinterpret_cast<Shared *>(shm.reserve(sharedSize)));
 }
 
 void

diff --git a/src/ipc/mem/PageStack.cc b/src/ipc/mem/PageStack.cc
index 4f1a17a66ec5f04571f4d4b8810400405f5707bf..9899fc36d749d0ab7d18f11a257792c81c10537d 100644 (file)
--- a/src/ipc/mem/PageStack.cc
+++ b/src/ipc/mem/PageStack.cc
@@ -17,10 +17,10 @@ const Ipc::Mem::PageStack::Value Writable = 0;
 Ipc::Mem::PageStack::PageStack(const String &id, const unsigned int capacity):
     shm(id.termedBuf())
 {
-    const size_t mySharedSize = Shared::MemSize(capacity);
-    shm.create(mySharedSize);
+    const size_t sharedSize = Shared::MemSize(capacity);
+    shm.create(sharedSize);
     assert(shm.mem());
-    shared = new (shm.reserve(mySharedSize)) Shared(capacity);
+    shared = new (shm.reserve(sharedSize)) Shared(capacity);
 }
 
 Ipc::Mem::PageStack::PageStack(const String &id): shm(id.termedBuf())
@@ -28,8 +28,8 @@ Ipc::Mem::PageStack::PageStack(const String &id): shm(id.termedBuf())
     shm.open();
     shared = reinterpret_cast<Shared *>(shm.mem());
     assert(shared);
-    const off_t mySharedSize = Shared::MemSize(shared->theCapacity);
-    assert(shared == reinterpret_cast<Shared *>(shm.reserve(mySharedSize)));
+    const off_t sharedSize = Shared::MemSize(shared->theCapacity);
+    assert(shared == reinterpret_cast<Shared *>(shm.reserve(sharedSize)));
 }
 
 void