Reformat

diff --git a/pdns/logger.cc b/pdns/logger.cc
index e290a2c9e6a3515afb0e356cafa98679b4b4b9a7..0711b971b07c491ab19a0abf1792da9ab5946286 100644 (file)
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -206,7 +206,7 @@ Logger& Logger::operator<<(const ComboAddress& ca)
 #ifdef RECURSOR
 void addTraceTS(const timeval& start, ostringstream& str)
 {
-  const auto & content = str.str();
+  const auto& content = str.str();
   if (content.empty() || content.at(content.size() - 1) == '\n') {
     timeval time{};
     gettimeofday(&time, nullptr);

diff --git a/pdns/logger.hh b/pdns/logger.hh
index 718a7f47c460ced9cf39ec7ec39e2904e728286a..5e2f45dea55b47d1d2d560146873316e0ad3da1a 100644 (file)
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -183,7 +183,6 @@ struct LogVariant
 
 using OptLog = std::optional<LogVariant>;
 
-
 #ifndef RECURSOR
 // Originally there was a flag but it was never set from !RECURSOR
 #define VLOG(log, x) VLOG only works in recursor
@@ -191,26 +190,26 @@ using OptLog = std::optional<LogVariant>;
 
 void addTraceTS(const timeval& start, ostringstream& str);
 
-#define VLOG(log, x)                                                    \
-  if (log) {                                                            \
-    if (std::holds_alternative<Logger*>((log)->v)) {                    \
+#define VLOG(log, x)                                                       \
+  if (log) {                                                               \
+    if (std::holds_alternative<Logger*>((log)->v)) {                       \
       *std::get<Logger*>(log->v) << Logger::Warning << (log)->prefix << x; \
-    }                                                                   \
-    else if (std::holds_alternative<ostringstream*>((log)->v)) {        \
-      addTraceTS((log)->start, *std::get<ostringstream*>((log)->v));    \
-      *std::get<ostringstream*>((log)->v) << (log)->prefix << x;        \
-    }                                                                   \
+    }                                                                      \
+    else if (std::holds_alternative<ostringstream*>((log)->v)) {           \
+      addTraceTS((log)->start, *std::get<ostringstream*>((log)->v));       \
+      *std::get<ostringstream*>((log)->v) << (log)->prefix << x;           \
+    }                                                                      \
   }
 
-#define VLOG_NO_PREFIX(log, x)                                          \
-  if (log) {                                                            \
-      if (std::holds_alternative<Logger*>((log)->v)) {                  \
-      *std::get<Logger*>(log->v) << Logger::Warning << x;               \
-    }                                                                   \
-    else if (std::holds_alternative<ostringstream*>((log)->v)) {        \
-      addTraceTS((log)->start, *std::get<ostringstream*>((log)->v));    \
-      *std::get<ostringstream*>((log)->v) << x;                         \
-    }                                                                   \
+#define VLOG_NO_PREFIX(log, x)                                       \
+  if (log) {                                                         \
+    if (std::holds_alternative<Logger*>((log)->v)) {                 \
+      *std::get<Logger*>(log->v) << Logger::Warning << x;            \
+    }                                                                \
+    else if (std::holds_alternative<ostringstream*>((log)->v)) {     \
+      addTraceTS((log)->start, *std::get<ostringstream*>((log)->v)); \
+      *std::get<ostringstream*>((log)->v) << x;                      \
+    }                                                                \
   }
 
 #endif

diff --git a/pdns/recursordist/syncres.cc b/pdns/recursordist/syncres.cc
index a9c1d4aef54b20ddf187caaa46e4ca8a625490a7..41442d59da12e60e249acc44ba17c7429f862c2e 100644 (file)
--- a/pdns/recursordist/syncres.cc
+++ b/pdns/recursordist/syncres.cc
@@ -469,13 +469,13 @@ bool SyncRes::s_save_parent_ns_set;
 unsigned int SyncRes::s_max_busy_dot_probes;
 bool SyncRes::s_addExtendedResolutionDNSErrors;
 
-#define LOG(x)                                  \
-  if (d_lm == Log) {                            \
-    g_log << Logger::Warning << x;              \
-  }                                             \
-  else if (d_lm == Store) {                     \
-    addTraceTS(d_fixednow, d_trace);            \
-    d_trace << x;                               \
+#define LOG(x)                       \
+  if (d_lm == Log) {                 \
+    g_log << Logger::Warning << x;   \
+  }                                  \
+  else if (d_lm == Store) {          \
+    addTraceTS(d_fixednow, d_trace); \
+    d_trace << x;                    \
   }
 
 OptLog SyncRes::LogObject(const string& prefix)
@@ -485,7 +485,7 @@ OptLog SyncRes::LogObject(const string& prefix)
     ret = {prefix, d_fixednow, &g_log};
   }
   else if (d_lm == Store) {
-    ret = {prefix, d_now, &d_trace};
+    ret = {prefix, d_fixednow, &d_trace};
   }
   return ret;
 }
@@ -3010,7 +3010,7 @@ std::vector<std::pair<DNSName, float>> SyncRes::shuffleInSpeedOrder(const DNSNam
   return rnameservers;
 }
 
-vector<ComboAddress> SyncRes::shuffleForwardSpeed(const DNSName &qname, const vector<ComboAddress>& rnameservers, const string& prefix, const bool wasRd)
+vector<ComboAddress> SyncRes::shuffleForwardSpeed(const DNSName& qname, const vector<ComboAddress>& rnameservers, const string& prefix, const bool wasRd)
 {
   vector<ComboAddress> nameservers = rnameservers;
   map<ComboAddress, float> speeds;