Fix: Avoid name shadowing

This patch fixes warnings from Clang due to shadowed names, using three
different strategies:

  1. **Reuse the shadowed variable.**  For the case of a shadowed return code
     variable, it was safe to reuse the existing return code variable,
     overwriting it with a different return code.

  2. **Rename the shadowing variable.** It is always safe to rename the
     variable that is causing the shadowing to a more descriptive name.

  3. **Follow coding conventions for member variable names.** One warning
     complained that a parameter to the constructor was shadowing the member
     variable it was being used to initialize.  The member variable should have
     been prefixed with `d_`, following our coding standards.

  4. **Removing the shadowed variable.** For the case of a shadowed storage key
     variable, it looks like this variable is completely unused, as it is
     shadowed only a few lines later, without any intermediate references.  We
     can safely remove the original variable.

Signed-off-by: Patrick M. Niedzielski <[email protected]>

Author: pniedzielski

src/applications/bmqstoragetool/m_bmqstoragetool_cslprinter.t.cpp

@@ -73,13 +73,14 @@ static void test1_humanReadableShortResultTest()
     // Prepare expected output
     bmqu::MemOutStream expectedStream(bmqtst::TestHelperUtil::allocator());
     {
-        bslim::Printer printer(&expectedStream, 0, -1);
-        printer.start();
-        printer.printAttribute("recordType", header.recordType());
-        printer.printAttribute("electorTerm", header.electorTerm());
-        printer.printAttribute("sequenceNumber", header.sequenceNumber());
-        printer.printAttribute("timestamp", header.timestamp());
-        printer.end();
+        bslim::Printer expectedPrinter(&expectedStream, 0, -1);
+        expectedPrinter.start();
+        expectedPrinter.printAttribute("recordType", header.recordType());
+        expectedPrinter.printAttribute("electorTerm", header.electorTerm());
+        expectedPrinter.printAttribute("sequenceNumber",
+                                       header.sequenceNumber());
+        expectedPrinter.printAttribute("timestamp", header.timestamp());
+        expectedPrinter.end();
         expectedStream << recordId << '\n';
     }
 
@@ -133,10 +134,12 @@ static void test2_humanReadableDetailResultTest()
         bmqu::MemOutStream recordStream(bmqtst::TestHelperUtil::allocator());
         record.print(recordStream, 2, 2);
 
-        CslRecordPrinter<bmqu::AlignedPrinter> printer(
+        CslRecordPrinter<bmqu::AlignedPrinter> expectedPrinter(
             expectedStream,
             bmqtst::TestHelperUtil::allocator());
-        printer.printRecordDetails(recordStream.str(), header, recordId);
+        expectedPrinter.printRecordDetails(recordStream.str(),
+                                           header,
+                                           recordId);
     }
 
     BMQTST_ASSERT_EQ(expectedStream.str(), resultStream.str());

src/applications/bmqstoragetool/m_bmqstoragetool_filemanager.cpp

@@ -271,7 +271,7 @@ bool FileManagerImpl::CslFileHandler::resetIterator(
 
     if (d_cslFromBegin) {
         // Move iterator to the first record.
-        const int rc = d_iter_p->next();
+        rc = d_iter_p->next();
         if (rc != 0) {
             errorDescription << "CSL file either empty or corrupted: rc="
                              << rc;

src/applications/bmqstoragetool/m_bmqstoragetool_filters.cpp

@@ -116,7 +116,6 @@ Filters::Filters(const bsl::vector<bsl::string>& queueKeys,
         }
     }
     if (!queueUris.empty()) {
-        mqbu::StorageKey                         key;
         bsl::vector<bsl::string>::const_iterator uriIt = queueUris.cbegin();
         for (; uriIt != queueUris.cend(); ++uriIt) {
             bsl::optional<mqbu::StorageKey> key = queueMap.findKeyByUri(

src/applications/bmqstoragetool/m_bmqstoragetool_printer.cpp

@@ -285,12 +285,12 @@ void printQueueDetails(bsl::ostream&          ostream,
                 // Sort Apps by number of records ascending
                 AppsData appsData(allocator);
                 appsData.reserve(appKeysCount);
-                for (QueueDetails::AppDetailsMap::const_iterator it =
+                for (QueueDetails::AppDetailsMap::const_iterator appIt =
                          details.d_appDetailsMap.cbegin();
-                     it != details.d_appDetailsMap.cend();
-                     ++it) {
-                    appsData.emplace_back(it->second.d_recordsNumber,
-                                          it->first);
+                     appIt != details.d_appDetailsMap.cend();
+                     ++appIt) {
+                    appsData.emplace_back(appIt->second.d_recordsNumber,
+                                          appIt->first);
                 }
                 bsl::sort(appsData.begin(), appsData.end());
 

src/applications/bmqstoragetool/m_bmqstoragetool_searchresult.cpp

@@ -254,7 +254,7 @@ bool SearchResultOffsetDecorator::processDeletionRecord(
 bool SearchResultSequenceNumberDecorator::stop(
     const CompositeSequenceNumber& sequenceNumber) const
 {
-    return sequenceNumberLt <= sequenceNumber &&
+    return d_sequenceNumberLt <= sequenceNumber &&
            !SearchResultDecorator::hasCache();
 }
 
@@ -263,7 +263,7 @@ SearchResultSequenceNumberDecorator::SearchResultSequenceNumberDecorator(
     const CompositeSequenceNumber&       sequenceNumberLt,
     bslma::Allocator*                    allocator)
 : SearchResultDecorator(component, allocator)
-, sequenceNumberLt(sequenceNumberLt)
+, d_sequenceNumberLt(sequenceNumberLt)
 {
     // NOTHING
 }

src/applications/bmqstoragetool/m_bmqstoragetool_searchresult.h

@@ -554,7 +554,7 @@ class SearchResultOffsetDecorator : public SearchResultDecorator {
 class SearchResultSequenceNumberDecorator : public SearchResultDecorator {
   private:
     /// Higher bound sequence number.
-    const CompositeSequenceNumber sequenceNumberLt;
+    const CompositeSequenceNumber d_sequenceNumberLt;
 
     // ACCESSORS