Reformat and use specific NOLINT

diff --git a/pdns/recursordist/rec-taskqueue.hh b/pdns/recursordist/rec-taskqueue.hh
index 73eedeecede7ced32c4132f39d2634b5fd541fb2..13658055c59d46b2411056ced74bed36ac91f892 100644 (file)
--- a/pdns/recursordist/rec-taskqueue.hh
+++ b/pdns/recursordist/rec-taskqueue.hh
@@ -57,4 +57,3 @@ uint64_t getAlmostExpiredTasksRun();
 uint64_t getAlmostExpiredTaskExceptions();
 
 bool taskQTypeIsSupported(QType qtype);
-

diff --git a/pdns/recursordist/recpacketcache.hh b/pdns/recursordist/recpacketcache.hh
index 5a8c23a60613d3637465a58058c37e9bc4b8c775..22207068a9b4e15786cc24d5fdd915243f4c75a1 100644 (file)
--- a/pdns/recursordist/recpacketcache.hh
+++ b/pdns/recursordist/recpacketcache.hh
@@ -105,8 +105,19 @@ private:
   struct Entry
   {
     Entry(DNSName&& qname, uint16_t qtype, uint16_t qclass, std::string&& packet, std::string&& query, bool tcp,
-          uint32_t qhash, time_t ttd, time_t now, uint32_t tag, vState vstate) : // NOLINT
-      d_name(std::move(qname)), d_packet(std::move(packet)), d_query(std::move(query)), d_ttd(ttd), d_creation(now), d_qhash(qhash), d_tag(tag), d_type(qtype), d_class(qclass), d_vstate(vstate), d_tcp(tcp)
+          // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
+          uint32_t qhash, time_t ttd, time_t now, uint32_t tag, vState vstate) :
+      d_name(std::move(qname)),
+      d_packet(std::move(packet)),
+      d_query(std::move(query)),
+      d_ttd(ttd),
+      d_creation(now),
+      d_qhash(qhash),
+      d_tag(tag),
+      d_type(qtype),
+      d_class(qclass),
+      d_vstate(vstate),
+      d_tcp(tcp)
     {
     }