Tidy

diff --git a/pdns/recursordist/rpzloader.cc b/pdns/recursordist/rpzloader.cc
index 02be125662888154cf8950b5f22586b2b54ef9d5..5f835969c61c029329b88646410332deed028a05 100644 (file)
--- a/pdns/recursordist/rpzloader.cc
+++ b/pdns/recursordist/rpzloader.cc
@@ -1,3 +1,25 @@
+/*
+ * This file is part of PowerDNS or dnsdist.
+ * Copyright -- PowerDNS.COM B.V. and its contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * In addition, for the avoidance of any doubt, permission is granted to
+ * link this program with OpenSSL and to (re)distribute the binaries
+ * produced as the result of such linking.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include <condition_variable>
 #include "arguments.hh"
 #include "dnsparser.hh"
 #include "dnsrecords.hh"
@@ -388,8 +410,10 @@ static bool dumpZoneToDisk(Logr::log_t logger, const DNSName& zoneName, const st
 
 // A struct that holds the condition var and related stuff to allow notifies to be sent to the tread owning
 // the struct.
-struct RPZWaiter {
-  RPZWaiter(std::thread::id arg) : id(arg) {}
+struct RPZWaiter
+{
+  RPZWaiter(std::thread::id arg) :
+    id(arg) {}
   std::thread::id id;
   std::mutex mutex;
   std::condition_variable condVar;
@@ -438,7 +462,7 @@ static void preloadRPZFIle(RPZTrackerParams& params, const DNSName& zoneName, st
     if (!params.soaRecordContent) {
       std::unique_lock lock(rpzwaiter.mutex);
       rpzwaiter.condVar.wait_for(lock, std::chrono::seconds(refresh),
-                              [&stop = rpzwaiter.stop] { return stop.load(); });
+                                 [&stop = rpzwaiter.stop] { return stop.load(); });
     }
     rpzwaiter.stop = false;
   }
@@ -457,7 +481,7 @@ static bool RPZTrackerIteration(RPZTrackerParams& params, const DNSName& zoneNam
   else {
     std::unique_lock lock(rpzwaiter.mutex);
     rpzwaiter.condVar.wait_for(lock, std::chrono::seconds(refresh),
-                            [&stop = rpzwaiter.stop] { return stop.load(); });
+                               [&stop = rpzwaiter.stop] { return stop.load(); });
     rpzwaiter.stop = false;
   }
   auto luaconfsLocal = g_luaconfs.getLocal();

diff --git a/pdns/recursordist/rpzloader.hh b/pdns/recursordist/rpzloader.hh
index 99fd749945edc599600537e4ff19e783e63df7e7..2933d9a1d0faa525f38407e549e2d80f2b652f76 100644 (file)
--- a/pdns/recursordist/rpzloader.hh
+++ b/pdns/recursordist/rpzloader.hh
@@ -27,7 +27,8 @@
 extern bool g_logRPZChanges;
 
 // Please make sure that the struct below only contains value types since they are used as parameters in a thread ct
-struct RPZTrackerParams {
+struct RPZTrackerParams
+{
   std::vector<ComboAddress> primaries;
   boost::optional<DNSFilterEngine::Policy> defpol;
   bool defpolOverrideLocal;