fix: address compiler warnings (clang)

Signed-off-by: James Chapman <james.chapman@pionix.de>
EVerest · Nov 5, 2024 · f152d40 · f152d40
1 parent db20357
commit f152d40
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 24 deletions.
diff --git a/include/utils/config.hpp b/include/utils/config.hpp
@@ -48,8 +48,6 @@ const static std::regex type_uri_regex{R"(^((?:\/[a-zA-Z0-9\-\_]+)+#\/[a-zA-Z0-9
 class Config {
 private:
     std::shared_ptr<RuntimeSettings> rs;
-    bool manager;
-
     json main;
 
     json manifests;

diff --git a/include/utils/error.hpp b/include/utils/error.hpp
@@ -71,14 +71,14 @@ struct Error {
     Error();
     ErrorType type;
     ErrorSubType sub_type;
-    std::string description;
     std::string message;
-    Severity severity;
+    std::string description;
     ImplementationIdentifier origin;
+    std::string vendor_id;
+    Severity severity;
     time_point timestamp;
     UUID uuid;
     State state;
-    std::string vendor_id;
 };
 
 using ErrorHandle = UUID;

diff --git a/include/utils/error/error_database.hpp b/include/utils/error/error_database.hpp
@@ -17,6 +17,7 @@ class ErrorDatabase {
     using EditErrorFunc = std::function<void(ErrorPtr)>;
 
     ErrorDatabase() = default;
+    virtual ~ErrorDatabase() = default;
 
     virtual void add_error(ErrorPtr error) = 0;
     virtual std::list<ErrorPtr> get_errors(const std::list<ErrorFilter>& filters) const = 0;

diff --git a/include/utils/error/error_factory.hpp b/include/utils/error/error_factory.hpp
@@ -44,6 +44,8 @@ class ErrorFactory {
     void set_default_vendor_id(std::string vendor_id);
 
 private:
+    const std::shared_ptr<ErrorTypeMap> error_type_map;
+
     std::optional<ImplementationIdentifier> default_origin;
     std::optional<Severity> default_severity;
     std::optional<State> default_state;
@@ -52,8 +54,6 @@ class ErrorFactory {
     std::optional<std::string> default_message;
     std::optional<std::string> default_vendor_id;
 
-    const std::shared_ptr<ErrorTypeMap> error_type_map;
-
     void set_description(Error& error) const;
 };
 

diff --git a/include/utils/error/error_manager_impl.hpp b/include/utils/error/error_manager_impl.hpp
@@ -57,13 +57,13 @@ class ErrorManagerImpl {
     bool can_be_cleared(const ErrorType& type, const ErrorSubType& sub_type) const;
     bool can_be_cleared(const ErrorType& type) const;
 
-    PublishErrorFunc publish_raised_error;
-    PublishErrorFunc publish_cleared_error;
-
-    std::shared_ptr<ErrorDatabase> database;
     std::shared_ptr<ErrorTypeMap> error_type_map;
+    std::shared_ptr<ErrorDatabase> database;
     std::list<ErrorType> allowed_error_types;
 
+    PublishErrorFunc publish_raised_error;
+    PublishErrorFunc publish_cleared_error;
+
     const bool validate_error_types;
 };
 

diff --git a/include/utils/error/error_manager_req.hpp b/include/utils/error/error_manager_req.hpp
@@ -40,11 +40,11 @@ class ErrorManagerReq {
     void on_error_cleared(const Error& error);
     void on_error(const Error& error, const bool raised) const;
 
-    SubscribeErrorFunc subscribe_error_func;
-
     std::shared_ptr<ErrorTypeMap> error_type_map;
     std::shared_ptr<ErrorDatabase> database;
     std::list<ErrorType> allowed_error_types;
+
+    SubscribeErrorFunc subscribe_error_func;
 };
 
 } // namespace error

diff --git a/include/utils/error/error_manager_req_global.hpp b/include/utils/error/error_manager_req_global.hpp
@@ -32,15 +32,15 @@ class ErrorManagerReqGlobal {
         ErrorCallback clear_callback;
     };
 
-    std::list<Subscription> subscriptions;
-
     void on_error_raised(const Error& error);
     void on_error_cleared(const Error& error);
 
-    SubscribeGlobalAllErrorsFunc subscribe_global_all_errors_func;
-
     std::shared_ptr<ErrorTypeMap> error_type_map;
     std::shared_ptr<ErrorDatabase> database;
+
+    SubscribeGlobalAllErrorsFunc subscribe_global_all_errors_func;
+
+    std::list<Subscription> subscriptions;
 };
 
 } // namespace error

diff --git a/lib/config.cpp b/lib/config.cpp
@@ -25,7 +25,7 @@ class ConfigParseException : public std::exception {
         SCHEMA
     };
     ConfigParseException(ParseErrorType err_t, const std::string& entry, const std::string& what = "") :
-        err_t(err_t), entry(entry), what(what){};
+        err_t(err_t), entry(entry), what(what) {};
 
     const ParseErrorType err_t;
     const std::string entry;
@@ -397,7 +397,7 @@ std::tuple<json, int> Config::load_and_validate_with_schema(const fs::path& file
 Config::Config(std::shared_ptr<RuntimeSettings> rs) : Config(rs, false) {
 }
 
-Config::Config(std::shared_ptr<RuntimeSettings> rs, bool manager) : rs(rs), manager(manager) {
+Config::Config(std::shared_ptr<RuntimeSettings> rs, bool manager) : rs(rs) {
     BOOST_LOG_FUNCTION();
 
     this->manifests = json({});
@@ -530,8 +530,6 @@ Config::Config(std::shared_ptr<RuntimeSettings> rs, bool manager) : rs(rs), mana
     }
 
     if (probe_module_id) {
-        auto& manifest = this->manifests["ProbeModule"];
-
         setup_probe_module_manifest(*probe_module_id, this->main, this->manifests);
 
         load_and_validate_manifest(*probe_module_id, this->main.at(*probe_module_id));

diff --git a/lib/error/error_manager_impl.cpp b/lib/error/error_manager_impl.cpp
@@ -68,7 +68,7 @@ std::list<ErrorPtr> ErrorManagerImpl::clear_error(const ErrorType& type, const b
     std::list<ErrorPtr> res = database->remove_errors(filters);
     std::stringstream ss;
     ss << "Cleared " << res.size() << " errors of type " << type << " with sub_types:" << std::endl;
-    for (const ErrorPtr error : res) {
+    for (const ErrorPtr& error : res) {
         this->publish_cleared_error(*error);
         ss << "  - " << error->sub_type << std::endl;
     }
@@ -100,7 +100,7 @@ std::list<ErrorPtr> ErrorManagerImpl::clear_all_errors() {
     std::list<ErrorPtr> res = database->remove_errors(filters);
     std::stringstream ss;
     ss << "Cleared " << res.size() << " errors:" << std::endl;
-    for (const ErrorPtr error : res) {
+    for (const ErrorPtr& error : res) {
         error->state = State::ClearedByModule;
         this->publish_cleared_error(*error);
         ss << "  - type: " << error->type << ", sub_type: " << error->sub_type << std::endl;

diff --git a/lib/everest.cpp b/lib/everest.cpp
@@ -726,7 +726,7 @@ UnsubscribeToken Everest::provide_external_mqtt_handler(const std::string& topic
 
     std::string external_topic = fmt::format("{}{}", this->mqtt_external_prefix, topic);
 
-    Handler external_handler = [this, handler, external_topic](json const& data) {
+    Handler external_handler = [handler, external_topic](json const& data) {
         EVLOG_verbose << fmt::format("Incoming external mqtt data for topic '{}'...", external_topic);
         if (!data.is_string()) {
             EVLOG_AND_THROW(EverestInternalError("External mqtt result is not a string (that should never happen)"));