From 8436f2e2bb545ca2e768e237ce416abc61553123 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 19 Nov 2023 18:02:28 -0600
Subject: [PATCH] refactor

---
 src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp | 7 +++----
 src/drives/winfsp/winfsp_drive.cpp                     | 2 +-
 src/events/consumers/logging_consumer.cpp              | 4 ++--
 src/file_manager/file_manager.cpp                      | 8 ++++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp b/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
index 70050691..c0599f7d 100644
--- a/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
+++ b/src/drives/winfsp/remotewinfsp/remote_winfsp_drive.cpp
@@ -98,10 +98,9 @@ remote_winfsp_drive::remote_winfsp_drive(app_config &config,
       config_(config),
       lock_(lock),
       factory_(std::move(factory)) {
-  E_SUBSCRIBE_EXACT(unmount_requested,
-                    [this](const unmount_requested & /* e */) {
-                      std::thread([this]() { this->shutdown(); }).detach();
-                    });
+  E_SUBSCRIBE_EXACT(unmount_requested, [this](const unmount_requested &) {
+    std::thread([this]() { this->shutdown(); }).detach();
+  });
 }
 
 auto remote_winfsp_drive::CanDelete(PVOID /*file_node*/, PVOID file_desc,
diff --git a/src/drives/winfsp/winfsp_drive.cpp b/src/drives/winfsp/winfsp_drive.cpp
index 95290c52..5e06791c 100644
--- a/src/drives/winfsp/winfsp_drive.cpp
+++ b/src/drives/winfsp/winfsp_drive.cpp
@@ -111,7 +111,7 @@ auto winfsp_drive::winfsp_service::OnStop() -> NTSTATUS {
 winfsp_drive::winfsp_drive(app_config &config, lock_data &lock,
                            i_provider &provider)
     : FileSystemBase(), provider_(provider), config_(config), lock_(lock) {
-  E_SUBSCRIBE_EXACT(unmount_requested, [this](const unmount_requested & /*e*/) {
+  E_SUBSCRIBE_EXACT(unmount_requested, [this](const unmount_requested &) {
     std::thread([this]() { this->shutdown(); }).detach();
   });
 }
diff --git a/src/events/consumers/logging_consumer.cpp b/src/events/consumers/logging_consumer.cpp
index c6e88bf7..60fa82be 100644
--- a/src/events/consumers/logging_consumer.cpp
+++ b/src/events/consumers/logging_consumer.cpp
@@ -45,9 +45,9 @@ logging_consumer::logging_consumer(const std::string &log_directory,
   reopen_log_file();
   E_SUBSCRIBE_ALL(process_event);
   E_SUBSCRIBE_EXACT(event_level_changed,
-                    [this](const event_level_changed &evt) {
+                    [this](const event_level_changed &changed) {
                       event_level_ = event_level_from_string(
-                          evt.get_new_event_level().get<std::string>());
+                          changed.get_new_event_level().get<std::string>());
                     });
   logging_thread_ =
       std::make_unique<std::thread>([this] { logging_thread(false); });
diff --git a/src/file_manager/file_manager.cpp b/src/file_manager/file_manager.cpp
index e4b6e191..06a0d8a6 100644
--- a/src/file_manager/file_manager.cpp
+++ b/src/file_manager/file_manager.cpp
@@ -71,8 +71,8 @@ file_manager::file_manager(app_config &config, i_provider &provider)
     upload_active_family_ = handles[idx++];
 
     E_SUBSCRIBE_EXACT(file_upload_completed,
-                      [this](const file_upload_completed &evt) {
-                        this->upload_completed(evt);
+                      [this](const file_upload_completed &completed) {
+                        this->upload_completed(completed);
                       });
   }
 }
@@ -742,7 +742,7 @@ void file_manager::start() {
     for (iterator->SeekToFirst(); iterator->Valid(); iterator->Next()) {
       const auto parts = utils::string::split(iterator->key().ToString(), ':');
       active_items.emplace_back(
-          active_item{parts[1U], iterator->value().ToString()});
+          active_item{parts.at(1U), iterator->value().ToString()});
     }
     for (const auto &active_item : active_items) {
       queue_upload(active_item.api_path, active_item.source_path, false);
@@ -876,7 +876,7 @@ void file_manager::upload_completed(const file_upload_completed &evt) {
       for (iterator->SeekToFirst(); iterator->Valid(); iterator->Next()) {
         const auto parts =
             utils::string::split(iterator->key().ToString(), ':');
-        if (parts[1U] == evt.get_api_path().get<std::string>()) {
+        if (parts.at(1U) == evt.get_api_path().get<std::string>()) {
           db_->Delete(rocksdb::WriteOptions(), upload_active_family_,
                       iterator->key());
           break;