From 424b92c6c27890c3c83cc2d990272df1e0a2f453 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Tue, 28 Jul 2015 00:58:04 +0200 Subject: [PATCH] boost foreach --- pdns/backends/gsql/gsqlbackend.cc | 31 +++++++++++++------------------ pdns/packethandler.cc | 19 +++++++++---------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index dcca151077..1ed86bb47b 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -35,7 +35,6 @@ #include "pdns/dnssecinfra.hh" #include #include -#include #include #include @@ -234,7 +233,7 @@ bool GSQLBackend::isMaster(const DNSName &domain, const string &ip) vector masters; stringtok(masters, d_result[0][0], " ,\t"); - BOOST_FOREACH(const string master, masters) { + for(const auto& master: masters) { const ComboAddress caMaster(master); if(ip == caMaster.toString()) return true; @@ -494,7 +493,7 @@ bool GSQLBackend::updateEmptyNonTerminals(uint32_t domain_id, const DNSName& zon } else { - for(auto &qname: erase) { + for(const auto& qname: erase) { try { d_deleteEmptyNonTerminalQuery_stmt-> bind("domain_id", domain_id)-> @@ -509,7 +508,7 @@ bool GSQLBackend::updateEmptyNonTerminals(uint32_t domain_id, const DNSName& zon } } - for(auto &qname: insert) { + for(const auto& qname: insert) { try { d_insertEmptyNonTerminalQuery_stmt-> bind("domain_id", domain_id)-> @@ -788,7 +787,7 @@ bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vec KeyData kd; while(d_ListDomainKeysQuery_stmt->hasNextRow()) { d_ListDomainKeysQuery_stmt->nextRow(row); - //~ BOOST_FOREACH(const std::string& val, row) { + //~ for(const auto& val: row) { //~ cerr<<"'"< *ips) { vector meta; getDomainMetadata(domain, "ALSO-NOTIFY", meta); - BOOST_FOREACH(string& str, meta) { + for(const auto& str: meta) { ips->insert(str); } } @@ -880,7 +879,7 @@ bool GSQLBackend::setDomainMetadata(const DNSName& name, const std::string& kind execute()-> reset(); if(!meta.empty()) { - BOOST_FOREACH(const std::string & value, meta) { + for(const auto& value: meta) { d_SetDomainMetadataQuery_stmt-> bind("kind", kind)-> bind("content", value)-> @@ -1078,7 +1077,7 @@ bool GSQLBackend::createSlaveDomain(const string &ip, const DNSName &domain, con if (!d_result.empty()) { // collect all IP addresses vector tmp; - BOOST_FOREACH(SSqlStatement::row_t& row, d_result) { + for(const auto& row: d_result) { if (account == row[1]) tmp.push_back(row[0]); } @@ -1214,7 +1213,7 @@ bool GSQLBackend::replaceRRSet(uint32_t domain_id, const DNSName& qname, const Q throw PDNSException("GSQLBackend unable to delete comment: "+e.txtReason()); } } - BOOST_FOREACH(const DNSResourceRecord& rr, rrset) { + for(const auto& rr: rrset) { feedRecord(rr); } @@ -1276,17 +1275,14 @@ bool GSQLBackend::feedRecord(const DNSResourceRecord &r, string *ordername) bool GSQLBackend::feedEnts(int domain_id, map& nonterm) { - string query; - pair nt; - - BOOST_FOREACH(nt, nonterm) { + for(const auto& nt: nonterm) { try { d_InsertEntQuery_stmt-> bind("domain_id",domain_id)-> bind("qname", nt.first)-> bind("auth",(nt.second || !d_dnssecQueries))-> execute()-> - reset(); + reset(); } catch (SSqlException &e) { throw PDNSException("GSQLBackend unable to feed empty non-terminal: "+e.txtReason()); @@ -1301,9 +1297,8 @@ bool GSQLBackend::feedEnts3(int domain_id, const DNSName &domain, map nt; - BOOST_FOREACH(nt, nonterm) { + for(const auto& nt: nonterm) { try { if(narrow || !nt.second) { d_InsertEntQuery_stmt-> @@ -1474,7 +1469,7 @@ bool GSQLBackend::replaceComments(const uint32_t domain_id, const DNSName& qname throw PDNSException("GSQLBackend unable to delete comment: "+e.txtReason()); } - BOOST_FOREACH(const Comment& comment, comments) { + for(const auto& comment: comments) { feedComment(comment); } @@ -1494,7 +1489,7 @@ string GSQLBackend::directBackendCmd(const string &query) while(stmt->hasNextRow()) { stmt->nextRow(row); - for(const auto &col: row) + for(const auto& col: row) out<<"\'"< #include #include -#include #include "dnssecinfra.hh" #include "dnsseckeeper.hh" #include "dns.hh" @@ -140,7 +139,7 @@ bool PacketHandler::addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd) DNSSECPrivateKey dpk; DNSSECKeeper::keyset_t keyset = d_dk.getKeys(p->qdomain); - BOOST_FOREACH(DNSSECKeeper::keyset_t::value_type value, keyset) { + for(const auto& value: keyset) { rr.qtype=QType::DNSKEY; rr.ttl=sd.default_ttl; rr.qname=p->qdomain; @@ -723,7 +722,7 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p) // check if the returned records are NS records bool haveNS=false; - BOOST_FOREACH(const DNSResourceRecord& ns, nsset) { + for(const auto& ns: nsset) { if(ns.qtype.getCode()==QType::NS) haveNS=true; } @@ -737,7 +736,7 @@ int PacketHandler::trySuperMasterSynchronous(DNSPacket *p) DNSBackend *db; if(!B.superMasterBackend(p->getRemote(), p->qdomain, nsset, &nameserver, &account, &db)) { L<qdomain<<" for potential supermaster "<getRemote()<<". Remote nameservers: "<qname<addRecord(rr); @@ -965,7 +964,7 @@ bool PacketHandler::tryDNAME(DNSPacket *p, DNSPacket*r, SOAData& sd, DNSName &ta DLOG(L< rrset = getBestDNAMESynth(p, sd, target); if(!rrset.empty()) { - BOOST_FOREACH(DNSResourceRecord& rr, rrset) { + for(auto& rr: rrset) { rr.d_place = DNSResourceRecord::ANSWER; r->addRecord(rr); } @@ -988,7 +987,7 @@ bool PacketHandler::tryWildcard(DNSPacket *p, DNSPacket*r, SOAData& sd, DNSName } else { DLOG(L<<"The best wildcard match: "<qname<addRecord(rr); target = rr.content; @@ -1339,7 +1338,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse) } else if(weDone) { bool haveRecords = false; - BOOST_FOREACH(rr, rrset) { + for(const auto& rr: rrset) { if((p->qtype.getCode() == QType::ANY || rr.qtype == p->qtype) && rr.qtype.getCode() && rr.auth) { r->addRecord(rr); haveRecords = true; @@ -1379,7 +1378,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse) editSOA(d_dk, sd.qname, r); - BOOST_FOREACH(const DNSResourceRecord& rr, r->getRRS()) { + for(const auto& rr: r->getRRS()) { if(rr.scopeMask) { noCache=1; break; -- 2.47.2