From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 17 Jul 2023 10:16:47 +0000 (+0200)
Subject: auth: Apply Coverity's suggestions to move objects whenever possible
X-Git-Tag: rec-5.0.0-alpha1~98^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d0fefb4a58460bd2fc503df5b6c3fb4e94cb192;p=thirdparty%2Fpdns.git

auth: Apply Coverity's suggestions to move objects whenever possible
---

diff --git a/ext/lmdb-safe/lmdb-typed.hh b/ext/lmdb-safe/lmdb-typed.hh
index 45da5e00b5..3fcdcc7412 100644
--- a/ext/lmdb-safe/lmdb-typed.hh
+++ b/ext/lmdb-safe/lmdb-typed.hh
@@ -242,7 +242,7 @@ class TypedDBI
 {
 public:
   TypedDBI(std::shared_ptr<MDBEnv> env, string_view name)
-    : d_env(env), d_name(name)
+    : d_env(std::move(env)), d_name(name)
   {
     d_main = d_env->openDB(name, MDB_CREATE);
 
diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 7c57b85b0d..4ca8ed0a47 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -194,7 +194,7 @@ void GeoIPBackend::initialize()
             string attr = iter->first.as<string>();
             if (attr == "content") {
               string content = iter->second.as<string>();
-              rr.content = content;
+              rr.content = std::move(content);
             }
             else if (attr == "weight") {
               rr.weight = iter->second.as<int>();
@@ -215,7 +215,7 @@ void GeoIPBackend::initialize()
         }
         else {
           string content = rec->second.as<string>();
-          rr.content = content;
+          rr.content = std::move(content);
           rr.weight = 100;
         }
         rr.auth = 1;
diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index a1b9594eec..d455cb7ca7 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -2440,7 +2440,7 @@ bool LMDBBackend::updateDNSSECOrderNameAndAuth(uint32_t domain_id, const DNSName
           lrr.ordername = hasOrderName;
           changed = true;
         }
-        newRRs.push_back(lrr);
+        newRRs.push_back(std::move(lrr));
       }
       if (changed) {
         cursor.put(key, serToString(newRRs));
diff --git a/pdns/dnswasher.cc b/pdns/dnswasher.cc
index 0d5dd1c86c..f370ce36ae 100644
--- a/pdns/dnswasher.cc
+++ b/pdns/dnswasher.cc
@@ -224,12 +224,12 @@ try
       cerr<<"Invalidly encoded base64 key provided"<<endl;
       exit(EXIT_FAILURE);
     }
-    ipo = IPCipherObfuscator::make(key, doDecrypt);
+    ipo = IPCipherObfuscator::make(std::move(key), doDecrypt);
   }
   else if(!g_vm.count("key") && g_vm.count("passphrase")) {
     string key = makeIPCipherKey(g_vm["passphrase"].as<string>());
 
-    ipo = IPCipherObfuscator::make(key, doDecrypt);
+    ipo = IPCipherObfuscator::make(std::move(key), doDecrypt);
   }
   else {
     cerr<<"Can't specify both 'key' and 'passphrase'"<<endl;
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 456d62ba59..d2e7b06096 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -322,7 +322,7 @@ void DynListener::sendlines(const string &l)
 void DynListener::registerFunc(const string &name, g_funk_t *gf, const string &usage, const string &args)
 {
   g_funkwithusage_t e = {gf, args, usage};
-  s_funcdb[name]=e;
+  s_funcdb[name] = std::move(e);
 }
 
 void DynListener::registerRestFunc(g_funk_t *gf)
diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index bbb840cbdf..ac46da046f 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -889,10 +889,11 @@ static int checkAllZones(DNSSECKeeper &dk, bool exitOnError)
       errors++;
     }
 
-    seenInfos.insert(di);
+    seenInfos.insert(std::move(di));
 
-    if(errors && exitOnError)
+    if (errors && exitOnError) {
       return EXIT_FAILURE;
+    }
   }
   cout<<"Checked "<<domainInfo.size()<<" zones, "<<errors<<" had errors."<<endl;
   if(!errors)
diff --git a/pdns/webserver.cc b/pdns/webserver.cc
index 34577e70e5..d221d37e16 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -143,7 +143,7 @@ static void bareHandlerWrapper(const WebServer::HandlerFunction& handler, YaHTTP
 void WebServer::registerBareHandler(const string& url, const HandlerFunction& handler)
 {
   YaHTTP::THandlerFunction f = [=](YaHTTP::Request* req, YaHTTP::Response* resp){return bareHandlerWrapper(handler, req, resp);};
-  YaHTTP::Router::Any(url, f);
+  YaHTTP::Router::Any(url, std::move(f));
 }
 
 static bool optionsHandler(HttpRequest* req, HttpResponse* resp) {
diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index f3b71104be..f479336ef1 100644
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -117,7 +117,7 @@ void apiDiscovery(HttpRequest* req, HttpResponse* resp) {
     { "version", 1 },
     { "url", "/api/v1" }
   };
-  Json doc = Json::array { version1 };
+  Json doc = Json::array { std::move(version1) };
 
   resp->setJsonBody(doc);
 }
@@ -130,7 +130,7 @@ void apiDiscoveryV1(HttpRequest* req, HttpResponse* resp) {
     { "server_url", "/api/v1/servers{/server}" },
     { "api_features", Json::array {} }
   };
-  Json doc = Json::array { version1 };
+  Json doc = Json::array { std::move(version1) };
 
   resp->setJsonBody(doc);
 
diff --git a/pdns/zoneparser-tng.hh b/pdns/zoneparser-tng.hh
index 1b7562766a..b50e86ec66 100644
--- a/pdns/zoneparser-tng.hh
+++ b/pdns/zoneparser-tng.hh
@@ -60,7 +60,7 @@ private:
   unsigned makeTTLFromZone(const std::string& str);
 
   struct filestate {
-    filestate(FILE* fp, string filename) : d_fp(fp), d_filename(filename), d_lineno(0){}
+    filestate(FILE* fp, string filename) : d_fp(fp), d_filename(std::move(filename)), d_lineno(0){}
     FILE *d_fp;
     string d_filename;
     int d_lineno;