Tidy

diff --git a/pdns/recursordist/rec-protozero.cc b/pdns/recursordist/rec-protozero.cc
index bcc870c4eca0c3231c0269b608cba5d175d5978b..957b1457795dc7047b6ca5b5fcc8e4c398c3b56a 100644 (file)
--- a/pdns/recursordist/rec-protozero.cc
+++ b/pdns/recursordist/rec-protozero.cc
@@ -54,7 +54,7 @@ void pdns::ProtoZero::RecMessage::addRR(const DNSRecord& record, const std::set<
       return;
     }
     ComboAddress data = content->getCA();
-    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin4.sin_addr.s_addr), sizeof(data.sin4.sin_addr.s_addr));
+    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin4.sin_addr.s_addr), sizeof(data.sin4.sin_addr.s_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
     break;
   }
   case QType::AAAA: {
@@ -63,7 +63,7 @@ void pdns::ProtoZero::RecMessage::addRR(const DNSRecord& record, const std::set<
       return;
     }
     ComboAddress data = content->getCA();
-    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin6.sin6_addr.s6_addr), sizeof(data.sin6.sin6_addr.s6_addr));
+    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin6.sin6_addr.s6_addr), sizeof(data.sin6.sin6_addr.s6_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
     break;
   }
   case QType::CNAME: {
@@ -138,38 +138,38 @@ void pdns::ProtoZero::RecMessage::addRR(const DNSRecord& record, const std::set<
 #ifdef NOD_ENABLED
 void pdns::ProtoZero::RecMessage::clearUDR(std::string& str)
 {
-  for (auto i : offsets) {
-    str.at(i) = 0;
+  for (auto offset : offsets) {
+    str.at(offset) = 0;
   }
 }
 #endif
 
 void pdns::ProtoZero::RecMessage::addEvents(const RecEventTrace& trace)
 {
-  for (const auto& t : trace.getEvents()) {
+  for (const auto& event : trace.getEvents()) {
     protozero::pbf_writer pbf_trace{d_message, static_cast<protozero::pbf_tag_type>(Field::trace)};
-    pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::ts), t.d_ts);
-    pbf_trace.add_uint32(static_cast<protozero::pbf_tag_type>(Event::event), t.d_event);
-    pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::start), t.d_start);
+    pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::ts), event.d_ts);
+    pbf_trace.add_uint32(static_cast<protozero::pbf_tag_type>(Event::event), event.d_event);
+    pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::start), event.d_start);
 
-    const auto& v = t.d_value;
-    if (std::holds_alternative<std::nullopt_t>(v)) {
+    const auto& value = event.d_value;
+    if (std::holds_alternative<std::nullopt_t>(value)) {
     }
-    else if (std::holds_alternative<bool>(v)) {
-      pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::boolVal), std::get<bool>(v));
+    else if (std::holds_alternative<bool>(value)) {
+      pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::boolVal), std::get<bool>(value));
     }
-    else if (std::holds_alternative<int64_t>(v)) {
-      pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::intVal), std::get<int64_t>(v));
+    else if (std::holds_alternative<int64_t>(value)) {
+      pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::intVal), std::get<int64_t>(value));
     }
-    else if (std::holds_alternative<std::string>(v)) {
-      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::stringVal), std::get<std::string>(v));
+    else if (std::holds_alternative<std::string>(value)) {
+      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::stringVal), std::get<std::string>(value));
     }
-    else if (std::holds_alternative<PacketBuffer>(v)) {
-      const PacketBuffer& p = std::get<PacketBuffer>(v);
-      pbf_trace.add_bytes(static_cast<protozero::pbf_tag_type>(Event::bytesVal), reinterpret_cast<const char*>(p.data()), p.size());
+    else if (std::holds_alternative<PacketBuffer>(value)) {
+      const auto& packetBuffer = std::get<PacketBuffer>(value);
+      pbf_trace.add_bytes(static_cast<protozero::pbf_tag_type>(Event::bytesVal), reinterpret_cast<const char*>(packetBuffer.data()), packetBuffer.size()); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
     }
-    if (!t.d_custom.empty()) {
-      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::custom), t.d_custom);
+    if (!event.d_custom.empty()) {
+      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::custom), event.d_custom);
     }
   }
 }