From: Otto Moerbeek Date: Wed, 26 Mar 2025 14:26:35 +0000 (+0100) Subject: Reformat X-Git-Tag: rec-5.4.0-alpha1~279^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ea36643c3d6fee38965c1d336ef6df703688bd8;p=thirdparty%2Fpdns.git Reformat --- diff --git a/pdns/ednscookies.cc b/pdns/ednscookies.cc index dbd5994894..598d62ab87 100644 --- 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 aa511ddd33..df7af278a0 100644 --- 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, member>, - ordered_non_unique, member>>> +class CookieStore : public multi_index_container, member>, + ordered_non_unique, member>>> { public: void prune(time_t cutoff); diff --git a/pdns/recursordist/syncres.hh b/pdns/recursordist/syncres.hh index 22eabb3a65..bc1337d4bd 100644 --- 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& 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& 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& srcmask, LWResult* res, bool* chained, const DNSName& nsName) const; boost::optional getEDNSSubnetMask(const DNSName& name, const ComboAddress& rem);