From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 8 Jun 2022 15:24:04 +0000 (+0200)
Subject: dnsdist: Fix a few performance-related warnings reported by cppcheck
X-Git-Tag: auth-4.8.0-alpha0~56^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F11685%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Fix a few performance-related warnings reported by cppcheck
---

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index c0f2ece9d8..7636d2eb08 100644
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -198,7 +198,7 @@ std::map<std::string, MetricDefinition> MetricDefinitionStorage::metrics{
 };
 #endif /* DISABLE_PROMETHEUS */
 
-bool addMetricDefinition(const std::string& name, const std::string type, const std::string& description) {
+bool addMetricDefinition(const std::string& name, const std::string& type, const std::string& description) {
 #ifndef DISABLE_PROMETHEUS
   return MetricDefinitionStorage::addMetricDefinition(name, type, description);
 #else
diff --git a/pdns/dnsdistdist/dnsdist-prometheus.hh b/pdns/dnsdistdist/dnsdist-prometheus.hh
index dbbfa1d011..6a02078c6c 100644
--- a/pdns/dnsdistdist/dnsdist-prometheus.hh
+++ b/pdns/dnsdistdist/dnsdist-prometheus.hh
@@ -23,7 +23,7 @@
 
 #ifndef DISABLE_PROMETHEUS
 // Metric types for Prometheus
-enum class PrometheusMetricType: int {
+enum class PrometheusMetricType: uint8_t {
     counter = 1,
     gauge = 2
 };
@@ -38,7 +38,7 @@ struct MetricDefinition {
   // Metric description
   std::string description;
   // Metric type for Prometheus
-  PrometheusMetricType prometheusType;
+  PrometheusMetricType prometheusType{PrometheusMetricType::counter};
 };
 
 struct MetricDefinitionStorage {
@@ -54,7 +54,7 @@ struct MetricDefinitionStorage {
     return true;
   };
 
-  static bool addMetricDefinition(const std::string& name, const std::string type, const std::string& description) {
+  static bool addMetricDefinition(const std::string& name, const std::string& type, const std::string& description) {
     static const std::map<std::string, PrometheusMetricType> namesToTypes = {
       {"counter", PrometheusMetricType::counter},
       {"gauge",   PrometheusMetricType::gauge},
diff --git a/pdns/dnsdistdist/dnsdist-web.hh b/pdns/dnsdistdist/dnsdist-web.hh
index 3e19b5716f..fde00de6c9 100644
--- a/pdns/dnsdistdist/dnsdist-web.hh
+++ b/pdns/dnsdistdist/dnsdist-web.hh
@@ -15,6 +15,6 @@ void dnsdistWebserverThread(int sock, const ComboAddress& local);
 void registerBuiltInWebHandlers();
 void clearWebHandlers();
 
-bool addMetricDefinition(const std::string& name, const std::string type, const std::string& description);
+bool addMetricDefinition(const std::string& name, const std::string& type, const std::string& description);
 
 std::string getWebserverConfig();