]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: Fix a few performance-related warnings reported by cppcheck 11685/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 8 Jun 2022 15:24:04 +0000 (17:24 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 8 Jun 2022 15:24:33 +0000 (17:24 +0200)
pdns/dnsdist-web.cc
pdns/dnsdistdist/dnsdist-prometheus.hh
pdns/dnsdistdist/dnsdist-web.hh

index c0f2ece9d82bf05d2ebb7d6bc9dc9042ed229128..7636d2eb089852ffc3e2619118da28272810d8ac 100644 (file)
@@ -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
index dbbfa1d0114ee4e4de752e7b09e91b46a8a254b8..6a02078c6c8f5585de6dc4992804d66dbb7f8611 100644 (file)
@@ -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},
index 3e19b5716fdc3e0488a447e785ce20c39b6fbc8a..fde00de6c9f6aa1bf0b80be9de7e68819a57e44f 100644 (file)
@@ -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();