Add a few more std::move() when possible (coverity)

diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc
index d3b16dfb7374e6db722484c124a7df4413244efc..d649beaba17681f19db18a4f3b2446ce3e131dd9 100644 (file)
--- a/pdns/lua-record.cc
+++ b/pdns/lua-record.cc
@@ -1173,7 +1173,7 @@ static string lua_createReverse6(const string &format, boost::optional<opts_t> e
         lquad.append(1, labels[31 - chunk * 4 - quartet][0]);
         together += labels[31 - chunk * 4 - quartet][0];
       }
-      quads.push_back(lquad);
+      quads.push_back(std::move(lquad));
     }
     ComboAddress ip6(together,0);
 

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index c85cb9eeea01a612ee2c7a4f2369940992ac0e98..a0a04ee2d20c50b706277caca6e58b137247cc99 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1770,7 +1770,7 @@ bool PacketHandler::opcodeQueryInner2(DNSPacket& pkt, queryState &state, bool re
   /* Add in SOA if required */
   if(state.target==d_sd.qname()) {
       zrr=makeEditedDNSZRFromSOAData(d_dk, d_sd);
-      rrset.push_back(zrr);
+      rrset.push_back(std::move(zrr));
   }
 
   DLOG(g_log<<"After first ANY query for '"<<state.target<<"', id="<<d_sd.domain_id<<": weDone="<<weDone<<", weHaveUnauth="<<weHaveUnauth<<", weRedirected="<<weRedirected<<", haveAlias='"<<haveAlias<<"'"<<endl);
@@ -1828,7 +1828,7 @@ bool PacketHandler::opcodeQueryInner2(DNSPacket& pkt, queryState &state, bool re
     if(tryWildcard(pkt, state.r, state.target, wildcard, wereRetargeted, nodata)) {
       if(wereRetargeted) {
         if (!retargeted) {
-          state.r->qdomainwild=wildcard;
+          state.r->qdomainwild=std::move(wildcard);
         }
         state.retargeted = true;
         return true;
@@ -1905,7 +1905,7 @@ bool PacketHandler::opcodeQueryInner2(DNSPacket& pkt, queryState &state, bool re
       return true;
     }
     // check whether this could be fixed easily
-    // if (*(zrr.dr.d_name.rbegin()) == '.') {
+    // if (*(rrset.back().dr.d_name.rbegin()) == '.') {
     //      g_log<<Logger::Error<<"Should not get here ("<<pkt.qdomain<<"|"<<pkt.qtype.toString()<<"): you have a trailing dot, this could be the problem (or run pdnsutil rectify-zone " <<d_sd.qname()<<")"<<endl;
     // } else {
          g_log<<Logger::Error<<"Should not get here ("<<pkt.qdomain<<"|"<<pkt.qtype.toString()<<"): please run pdnsutil rectify-zone "<<d_sd.qname()<<endl;

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index 67e3c85f18b4b0fe507bd61c99ccd42105e60a68..0cd8211ff284aac29b7d5ebb07f3252490a48f75 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -350,7 +350,7 @@ void UeberBackend::updateZoneCache()
       nettree.insert_or_assign(net, tag);
     }
   }
-  g_zoneCache.replace(nettree); // FIXME: this needs some smart pending stuff too
+  g_zoneCache.replace(std::move(nettree)); // FIXME: this needs some smart pending stuff too
 
   AuthZoneCache::ViewsMap viewsmap;
   for (auto& backend : backends) {
@@ -360,13 +360,13 @@ void UeberBackend::updateZoneCache()
       vector<ZoneName> zones;
       backend->viewListZones(view, zones);
       for (ZoneName& zone : zones) {
-        auto zonename = DNSName(zone);
+        const auto& zonename = zone.operator const DNSName&();
         auto variant = zone.getVariant();
-        viewsmap[view][zonename] = variant;
+        viewsmap[view][zonename] = std::move(variant);
       }
     }
   }
-  g_zoneCache.replace(viewsmap);
+  g_zoneCache.replace(std::move(viewsmap));
 }
 
 void UeberBackend::rediscover(string* status)

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 0463cb8a9662bc21e7ae0d2cf73a992b6784d2e7..5ec8c2c9cd04fd9740100656a617953e29b036e7 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -2045,7 +2045,7 @@ static void apiServerZonesGET(HttpRequest* req, HttpResponse* resp)
     zonename.makeUsLowerCase();
     DomainInfo domainInfo;
     if (backend.getDomainInfo(zonename, domainInfo)) {
-      domains.push_back(domainInfo);
+      domains.push_back(std::move(domainInfo));
     }
   }
   else {