Reformat

diff --git a/pdns/ednscookies.cc b/pdns/ednscookies.cc
index dbd599489430d3b881f046a39108e90fe259a27c..598d62ab871a62086d6303bc449808ae8bbe1b93 100644 (file)
--- a/pdns/ednscookies.cc
+++ b/pdns/ednscookies.cc
@@ -67,7 +67,7 @@ string EDNSCookiesOpt::makeOptString() const
 
 string EDNSCookiesOpt::toDisplayString() const
 {
-  std::string ret = makeHexDump(client, "");;
+  std::string ret = makeHexDump(client, "");
   if (!server.empty()) {
     ret += '|';
     if (server.length() != 16) {
@@ -75,7 +75,7 @@ string EDNSCookiesOpt::toDisplayString() const
       ret += makeHexDump(server, "");
     }
     else {
-       // It very likely is a rfc9018 one
+      // It very likely is a rfc9018 one
       ret += makeHexDump(server.substr(0, 1), ""); // Version
       ret += '|';
       ret += makeHexDump(server.substr(1, 3), ""); // Reserved

diff --git a/pdns/recursordist/rec-cookiestore.hh b/pdns/recursordist/rec-cookiestore.hh
index aa511ddd33f447a25853286e40fd3cf327588461..df7af278a0d43db10b70ed30ecf7b848fad6940d 100644 (file)
--- a/pdns/recursordist/rec-cookiestore.hh
+++ b/pdns/recursordist/rec-cookiestore.hh
@@ -95,9 +95,9 @@ struct CookieEntry
   mutable Support d_support{Support::Unsupported};
 };
 
-class CookieStore : public multi_index_container < CookieEntry,
-  indexed_by < ordered_unique<tag<ComboAddress>, member<CookieEntry, ComboAddress, &CookieEntry::d_address>>,
-               ordered_non_unique<tag<time_t>, member<CookieEntry, time_t, &CookieEntry::d_lastupdate>>>>
+class CookieStore : public multi_index_container<CookieEntry,
+                                                 indexed_by<ordered_unique<tag<ComboAddress>, member<CookieEntry, ComboAddress, &CookieEntry::d_address>>,
+                                                            ordered_non_unique<tag<time_t>, member<CookieEntry, time_t, &CookieEntry::d_lastupdate>>>>
 {
 public:
   void prune(time_t cutoff);

diff --git a/pdns/recursordist/syncres.hh b/pdns/recursordist/syncres.hh
index 22eabb3a65f4964b6e2d9021ff13ea60bdc9b295..bc1337d4bda1df847f2c61e8d45ea088bc45d00e 100644 (file)
--- a/pdns/recursordist/syncres.hh
+++ b/pdns/recursordist/syncres.hh
@@ -685,7 +685,7 @@ private:
 
   bool doSpecialNamesResolve(const DNSName& qname, QType qtype, QClass qclass, vector<DNSRecord>& ret);
 
-  LWResult::Result asyncresolveWrapper(const OptLog&log, const ComboAddress& address, bool ednsMANDATORY, const DNSName& domain, const DNSName& auth, int type, bool doTCP, bool sendRDQuery, struct timeval* now, boost::optional<Netmask>& srcmask, LWResult* res, bool* chained, const DNSName& nsName) const;
+  LWResult::Result asyncresolveWrapper(const OptLog& log, const ComboAddress& address, bool ednsMANDATORY, const DNSName& domain, const DNSName& auth, int type, bool doTCP, bool sendRDQuery, struct timeval* now, boost::optional<Netmask>& srcmask, LWResult* res, bool* chained, const DNSName& nsName) const;
 
   boost::optional<Netmask> getEDNSSubnetMask(const DNSName& name, const ComboAddress& rem);