[2165] Rename variables

diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index ab3359b96c18cd6af358447e38482572a52e87ce..603bf5c3b6fbcd09ec1f6b84eec7cb2c33c2e9a7 100644 (file)
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -485,10 +485,10 @@ protected:
                                        isc::dns::ConstRRsetPtr rrset,
                                        FindResultFlags flags = RESULT_DEFAULT)
     {
-        ConstRRsetPtr rr = stripRRsigs(rrset, options);
+        ConstRRsetPtr rp = stripRRsigs(rrset, options);
         return (ZoneFinderContextPtr(
                     new Context(*this, options,
-                                ResultContext(code, rr, flags))));
+                                ResultContext(code, rp, flags))));
     }
 
 private:

diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index e4ef97fc4d986608e3bb6ef9e8fdb8ffcc831046..e38a48725e6c8cdd82daca82a4c986c6819060a5 100644 (file)
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -854,13 +854,13 @@ private:
                     // in case the caller has the same RRset but as a result
                     // of normal find() and needs to know they are of the same
                     // kind; otherwise we simply use the stored RBNodeRRset.
-                    ConstRRsetPtr rr;
+                    ConstRRsetPtr rp;
                     if (wild_expanded) {
-                        rr = found->second->getUnderlyingRRset();
+                        rp = found->second->getUnderlyingRRset();
                     } else {
-                        rr = found->second;
+                        rp = found->second;
                     }
-                    result.push_back(ZoneFinder::stripRRsigs(rr, options));
+                    result.push_back(ZoneFinder::stripRRsigs(rp, options));
                 }
             }
         }

diff --git a/src/lib/datasrc/zone.h b/src/lib/datasrc/zone.h
index 15a949d70498ef90504affb34625d5f7d74aa2d8..3ca1043ca0965202c5a0b30cb47b58e0a86223ed 100644 (file)
--- a/src/lib/datasrc/zone.h
+++ b/src/lib/datasrc/zone.h
@@ -137,17 +137,17 @@ public:
     /// \brief A helper function to strip RRSIGs when FIND_DNSSEC is not
     /// requested.
     static isc::dns::ConstRRsetPtr
-    stripRRsigs(isc::dns::ConstRRsetPtr rr, const FindOptions options) {
-        if (rr) {
-            isc::dns::ConstRRsetPtr sig_rrset = rr->getRRsig();
+    stripRRsigs(isc::dns::ConstRRsetPtr rp, const FindOptions options) {
+        if (rp) {
+            isc::dns::ConstRRsetPtr sig_rrset = rp->getRRsig();
             if (sig_rrset &&
                 ((options & ZoneFinder::FIND_DNSSEC) == 0)) {
                 isc::dns::RRsetPtr result_base
-                    (new isc::dns::RRset(rr->getName(),
-                                         rr->getClass(),
-                                         rr->getType(),
-                                         rr->getTTL()));
-                for (isc::dns::RdataIteratorPtr i(rr->getRdataIterator());
+                    (new isc::dns::RRset(rp->getName(),
+                                         rp->getClass(),
+                                         rp->getType(),
+                                         rp->getTTL()));
+                for (isc::dns::RdataIteratorPtr i(rp->getRdataIterator());
                      !i->isLast();
                      i->next()) {
                     result_base->addRdata(i->getCurrent());
@@ -157,7 +157,7 @@ public:
             }
         }
 
-        return (rr);
+        return (rp);
     }
 
     /// \brief Context of the result of a find() call.