Merge pull request #14240 from PowerDNS/dependabot/pip/pdns/dnsdistdist/docs/requests...

[thirdparty/pdns.git] / pdns / cdb.cc

diff --git a/pdns/cdb.cc b/pdns/cdb.cc
index 5dd391539f1aef80946b06ac0cbcdff574444838..ed8b8fda2e85c7821a7de6714faef93261fbb2e7 100644 (file)
--- a/pdns/cdb.cc
+++ b/pdns/cdb.cc
@@ -123,7 +123,7 @@ bool CDB::readNext(pair<string, string> &value) {
       throw std::runtime_error("Error while reading value for key '" + key + "' from CDB database: " + std::to_string(ret));
     }
 
-    value = make_pair(std::move(key), std::move(val));
+    value = {std::move(key), std::move(val)};
     return true;
   }
 
@@ -145,9 +145,7 @@ vector<string> CDB::findall(string &key)
     throw std::runtime_error("Error looking up key '" + key + "' from CDB database: " + std::to_string(res));
   }
 
-  int x=0;
   while(cdb_findnext(&cdbf) > 0) {
-    x++;
     unsigned int vpos = cdb_datapos(&d_cdb);
     unsigned int vlen = cdb_datalen(&d_cdb);
     std::string val;