Merge 6485b75 into 3ddc0fb

cpputest · May 9, 2020 · 3118732 · 3118732
2 parents 3ddc0fb + 6485b75
commit 3118732
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/include/CppUTest/SimpleString.h b/include/CppUTest/SimpleString.h
@@ -109,10 +109,10 @@ class SimpleString
 
     void deallocateInternalBuffer();
     void setInternalBufferAsEmptyString();
-    void setInternalBufferToNewBuffer(size_t size);
-    void setInternalBufferTo(char* buffer, size_t size);
+    void setInternalBufferToNewBuffer(size_t bufferSize);
+    void setInternalBufferTo(char* buffer, size_t bufferSize);
     void copyBufferToNewInternalBuffer(const char* otherBuffer);
-    void copyBufferToNewInternalBuffer(const char* otherBuffer, size_t size);
+    void copyBufferToNewInternalBuffer(const char* otherBuffer, size_t bufferSize);
     void copyBufferToNewInternalBuffer(const SimpleString& otherBuffer);
 
     char *buffer_;

diff --git a/include/CppUTest/StandardCLibrary.h b/include/CppUTest/StandardCLibrary.h
@@ -30,7 +30,7 @@
 /* Needed for ... */
 #include <stdarg.h>
 
-//Kludge to get a va_copy in VC++ V6 and in GCC 98
+/* Kludge to get a va_copy in VC++ V6 and in GCC 98 */
 #ifndef va_copy
 #ifdef __GNUC__
 #define va_copy __va_copy

diff --git a/src/CppUTest/SimpleString.cpp b/src/CppUTest/SimpleString.cpp
@@ -247,28 +247,28 @@ void SimpleString::setInternalBufferAsEmptyString()
     buffer_ = getEmptyString();
 }
 
-void SimpleString::copyBufferToNewInternalBuffer(const char* otherBuffer, size_t size)
+void SimpleString::copyBufferToNewInternalBuffer(const char* otherBuffer, size_t bufferSize)
 {
     deallocateInternalBuffer();
 
-    bufferSize_ = size;
+    bufferSize_ = bufferSize;
     buffer_ = copyToNewBuffer(otherBuffer, bufferSize_);
 }
 
-void SimpleString::setInternalBufferToNewBuffer(size_t size)
+void SimpleString::setInternalBufferToNewBuffer(size_t bufferSize)
 {
     deallocateInternalBuffer();
 
-    bufferSize_ = size;
+    bufferSize_ = bufferSize;
     buffer_ = allocStringBuffer(bufferSize_, __FILE__, __LINE__);
     buffer_[0] = '\0';
 }
 
-void SimpleString::setInternalBufferTo(char* buffer, size_t size)
+void SimpleString::setInternalBufferTo(char* buffer, size_t bufferSize)
 {
     deallocateInternalBuffer();
 
-    bufferSize_ = size;
+    bufferSize_ = bufferSize;
     buffer_ = buffer;
 }
 

diff --git a/src/CppUTest/TestMemoryAllocator.cpp b/src/CppUTest/TestMemoryAllocator.cpp
@@ -552,22 +552,22 @@ size_t MemoryAccountant::maximumAllocationAtATimeOfSize(size_t size) const
 
 size_t MemoryAccountant::totalAllocations() const
 {
-    size_t totalAllocations = 0;
+    size_t theTotalAllocations = 0;
 
     for (MemoryAccountantAllocationNode* node = head_; node; node = node->next_)
-        totalAllocations += node->allocations_;
+        theTotalAllocations += node->allocations_;
 
-    return totalAllocations;
+    return theTotalAllocations;
 }
 
 size_t MemoryAccountant::totalDeallocations() const
 {
-    size_t totalDeallocations = 0;
+    size_t theTotalDeallocations = 0;
 
     for (MemoryAccountantAllocationNode* node = head_; node; node = node->next_)
-        totalDeallocations += node->deallocations_;
+        theTotalDeallocations += node->deallocations_;
 
-    return totalDeallocations;
+    return theTotalDeallocations;
 }
 
 SimpleString MemoryAccountant::reportNoAllocations() const
@@ -606,16 +606,16 @@ SimpleString MemoryAccountant::report() const
     if (head_ == NULLPTR)
       return reportNoAllocations();
 
-    SimpleString report = reportTitle() + reportHeader();
+    SimpleString accountantReport = reportTitle() + reportHeader();
 
     for (MemoryAccountantAllocationNode* node = head_; node; node = node->next_)
-        report += StringFromFormat(MEMORY_ACCOUNTANT_ROW_FORMAT, stringSize(node->size_).asCharString(), (int) node->allocations_, (int) node->deallocations_, (int) node->maxAllocations_);
+        accountantReport += StringFromFormat(MEMORY_ACCOUNTANT_ROW_FORMAT, stringSize(node->size_).asCharString(), (int) node->allocations_, (int) node->deallocations_, (int) node->maxAllocations_);
 
-    return report + reportFooter();
+    return accountantReport + reportFooter();
 }
 
-AccountingTestMemoryAllocator::AccountingTestMemoryAllocator(MemoryAccountant& accountant, TestMemoryAllocator* originalAllocator)
-    : accountant_(accountant), originalAllocator_(originalAllocator), head_(NULLPTR)
+AccountingTestMemoryAllocator::AccountingTestMemoryAllocator(MemoryAccountant& accountant, TestMemoryAllocator* origAllocator)
+    : accountant_(accountant), originalAllocator_(origAllocator), head_(NULLPTR)
 {
 }