Reformat and tidy annotations

diff --git a/pdns/logger.hh b/pdns/logger.hh
index 37216584dc3a9304e21a434ee377dcdb02d792d5..9a84661442c1d9597d9f4a272340faeabd425755 100644 (file)
--- a/pdns/logger.hh
+++ b/pdns/logger.hh
@@ -185,24 +185,30 @@ using OptLog = std::optional<LogVariant>;
 
 void addTraceTS(const timeval& start, ostringstream& str);
 
-#define VLOG(log, x)                                                    \
-  if (log) {                                                            \
-    if (std::holds_alternative<std::reference_wrapper<Logger>>((log)->v)) { \
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
+#define VLOG(log, x)                                                                                     \
+  if (log) {                                                                                             \
+    if (std::holds_alternative<std::reference_wrapper<Logger>>((log)->v)) {                              \
+      /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                                   \
       std::get<std::reference_wrapper<Logger>>((log)->v).get() << Logger::Warning << (log)->prefix << x; \
-    }                                                                   \
-    else if (std::holds_alternative<std::reference_wrapper<ostringstream>>((log)->v)) { \
-      addTraceTS((log)->start, std::get<std::reference_wrapper<ostringstream>>((log)->v).get()); \
-      std::get<std::reference_wrapper<ostringstream>>((log)->v).get() << (log)->prefix << x; \
-    }                                                                   \
+    }                                                                                                    \
+    else if (std::holds_alternative<std::reference_wrapper<ostringstream>>((log)->v)) {                  \
+      addTraceTS((log)->start, std::get<std::reference_wrapper<ostringstream>>((log)->v).get());         \
+      /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                                   \
+      std::get<std::reference_wrapper<ostringstream>>((log)->v).get() << (log)->prefix << x;             \
+    }                                                                                                    \
   }
 
-#define VLOG_NO_PREFIX(log, x)                                          \
-  if (log) {                                                            \
-    if (std::holds_alternative<std::reference_wrapper<Logger>>((log)->v)) { \
-      std::get<std::reference_wrapper<Logger>>((log)->v).get() << Logger::Warning << x; \
-    }                                                                   \
-    else if (std::holds_alternative<std::reference_wrapper<ostringstream>>((log)->v)) { \
+// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
+#define VLOG_NO_PREFIX(log, x)                                                                   \
+  if (log) {                                                                                     \
+    if (std::holds_alternative<std::reference_wrapper<Logger>>((log)->v)) {                      \
+      /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                           \
+      std::get<std::reference_wrapper<Logger>>((log)->v).get() << Logger::Warning << x;          \
+    }                                                                                            \
+    else if (std::holds_alternative<std::reference_wrapper<ostringstream>>((log)->v)) {          \
       addTraceTS((log)->start, std::get<std::reference_wrapper<ostringstream>>((log)->v).get()); \
-      std::get<std::reference_wrapper<ostringstream>>((log)->v).get() << x; \
-    }                                                                   \
+      /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                           \
+      std::get<std::reference_wrapper<ostringstream>>((log)->v).get() << x;                      \
+    }                                                                                            \
   }