From 9fd0d2be12e267509b64e22a796e7493fcc27b13 Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Thu, 14 Mar 2024 21:27:36 +0200
Subject: [PATCH] clang: fix some compiler warnings

From CI.
---
 lib/mu-server.cc       | 1 -
 lib/mu-store.cc        | 2 +-
 lib/mu-xapian-db.hh    | 3 ---
 lib/utils/mu-logger.cc | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/mu-server.cc b/lib/mu-server.cc
index 8e6203a0..c508dd89 100644
--- a/lib/mu-server.cc
+++ b/lib/mu-server.cc
@@ -119,7 +119,6 @@ private:
 	std::string		fname_;
 	using OutType = std::variant<std::ofstream, std::ostringstream>;
 	OutType out_;
-	bool do_unlink_{};
 };
 
 
diff --git a/lib/mu-store.cc b/lib/mu-store.cc
index 975b557b..eb08eac0 100644
--- a/lib/mu-store.cc
+++ b/lib/mu-store.cc
@@ -655,7 +655,7 @@ Store::maildirs() const
 
 	Scanner::Handler handler = [&](const std::string& path, auto&& _1, auto&& _2) {
 		auto md{path.substr(prefix_size)};
-		mdirs.emplace_back(std::move(md.empty() ? "/" : md));
+		mdirs.emplace_back(md.empty() ? "/" : std::move(md));
 		return true;
 	};
 
diff --git a/lib/mu-xapian-db.hh b/lib/mu-xapian-db.hh
index 62c5789e..c0d58653 100644
--- a/lib/mu-xapian-db.hh
+++ b/lib/mu-xapian-db.hh
@@ -536,10 +536,7 @@ private:
 
 	mutable std::mutex lock_;
 	std::string path_;
-
 	DbType	db_;
-	bool	in_tx_;
-
 	size_t	tx_level_{};
 	const size_t batch_size_;
 	size_t changes_{};
diff --git a/lib/utils/mu-logger.cc b/lib/utils/mu-logger.cc
index 04c6611a..c9f516d1 100644
--- a/lib/utils/mu-logger.cc
+++ b/lib/utils/mu-logger.cc
@@ -209,7 +209,7 @@ test_logger_threads(void)
 	/* log to the logger file from many threass */
 	for (auto n = 0; n != thread_num; ++n)
 		threads.emplace_back(
-			std::thread([n,&running]{
+			std::thread([&running]{
 				while (running) {
 					//mu_debug("log message from thread <{}>", n);
 					std::this_thread::yield();