From 242bbeb5649b62a9af4268139afe6f57250520e0 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 18 Jul 2020 10:37:35 +0200
Subject: Fix various clang-tidy warnings

---
 raul/Maid.hpp            | 4 +++-
 raul/Socket.hpp          | 5 ++---
 raul/TimeSlice.hpp       | 3 ++-
 raul/TimeStamp.hpp       | 2 +-
 test/maid_test.cpp       | 8 ++++++--
 test/ringbuffer_test.cpp | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/raul/Maid.hpp b/raul/Maid.hpp
index b7ae5d9..1479f71 100644
--- a/raul/Maid.hpp
+++ b/raul/Maid.hpp
@@ -66,12 +66,14 @@ public:
 	class Disposer {
 	public:
 		explicit Disposer(Maid* maid) : _maid(maid) {}
-		Disposer()                    : _maid(nullptr) {}
+
+		Disposer() = default;
 
 		void operator()(T* obj) {
 			if (_maid) { _maid->dispose(obj); }
 		}
 
+	private:
 		Maid* _maid{nullptr};
 	};
 
diff --git a/raul/Socket.hpp b/raul/Socket.hpp
index df7645a..579a5cd 100644
--- a/raul/Socket.hpp
+++ b/raul/Socket.hpp
@@ -175,9 +175,8 @@ Socket::set_addr(const std::string& uri)
 			host = "0.0.0.0";  // INADDR_ANY
 		}
 
-		struct addrinfo* ainfo;
-		int              st = 0;
-		if ((st = getaddrinfo(host.c_str(), port.c_str(), nullptr, &ainfo))) {
+		struct addrinfo* ainfo = nullptr;
+		if (getaddrinfo(host.c_str(), port.c_str(), nullptr, &ainfo)) {
 			return false;
 		}
 
diff --git a/raul/TimeSlice.hpp b/raul/TimeSlice.hpp
index 3f629ea..7758602 100644
--- a/raul/TimeSlice.hpp
+++ b/raul/TimeSlice.hpp
@@ -130,7 +130,8 @@ public:
 
 	inline TimeUnit beats_unit() const { return _start_beats.unit(); }
 	inline TimeUnit ticks_unit() const { return _start_ticks.unit(); }
-	inline TimeUnit real_unit()  const { return {TimeUnit::SECONDS, 0}; }
+
+	static inline TimeUnit real_unit() { return {TimeUnit::SECONDS, 0}; }
 
 private:
 	inline void update_beat_time() {
diff --git a/raul/TimeStamp.hpp b/raul/TimeStamp.hpp
index c07a552..d8d4939 100644
--- a/raul/TimeStamp.hpp
+++ b/raul/TimeStamp.hpp
@@ -93,7 +93,7 @@ public:
 	{
 		dec = std::max(0.0, dec);
 		dec = std::min(double(std::numeric_limits<uint32_t>::max()), dec);
-		double       integral;
+		double       integral   = 0.0;
 		const double fractional = modf(dec, &integral);
 		_ticks    = static_cast<uint32_t>(integral);
 		_subticks = static_cast<uint32_t>(fractional * unit.ppt());
diff --git a/test/maid_test.cpp b/test/maid_test.cpp
index c2a5856..47781a0 100644
--- a/test/maid_test.cpp
+++ b/test/maid_test.cpp
@@ -36,10 +36,13 @@ static std::atomic<size_t> n_finished_threads(0);
 
 class Junk : public Maid::Disposable {
 public:
-	explicit Junk(size_t v) : val(v) { ++n_junk; }
+	explicit Junk(size_t v) : _val(v) { ++n_junk; }
 	~Junk() override { --n_junk; }
 
-	size_t val;
+	size_t value() const { return _val; }
+
+private:
+	size_t _val;
 };
 
 static void
@@ -47,6 +50,7 @@ litter(Maid* maid)
 {
 	for (size_t i = 0; i < n_junk_per_thread; ++i) {
 		Maid::managed_ptr<Junk> a = maid->make_managed<Junk>(i);
+		assert(a->value() == i);
 	}
 
 	++n_finished_threads;
diff --git a/test/ringbuffer_test.cpp b/test/ringbuffer_test.cpp
index 37a2740..d7caeaf 100644
--- a/test/ringbuffer_test.cpp
+++ b/test/ringbuffer_test.cpp
@@ -28,7 +28,7 @@
 #include <string>
 #include <thread>
 
-#define MSG_SIZE 20u
+constexpr const auto MSG_SIZE = 20u;
 
 namespace {
 
-- 
cgit v1.2.1