From 7827b06edf6a0629eb659540595c347965abfb88 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 27 Nov 2021 00:36:19 +0000
Subject: Fix up lots of static analyzer warnings

---
 lib/jsonParse-persistence.cpp |  2 +-
 lib/maths.h                   |  4 ++--
 lib/persistence.cpp           |  5 +++--
 lib/persistence.h             | 12 ++++++------
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/jsonParse-persistence.cpp b/lib/jsonParse-persistence.cpp
index a9b9a83..fe8bf8d 100644
--- a/lib/jsonParse-persistence.cpp
+++ b/lib/jsonParse-persistence.cpp
@@ -92,7 +92,7 @@ namespace Persistence {
 	wrv(std::ostream & strm, char ch)
 	{
 		strm.put(ch);
-	};
+	}
 	static inline void
 	wrh(std::ostream & strm, char ch)
 	{
diff --git a/lib/maths.h b/lib/maths.h
index 18332b7..ad2f3e5 100644
--- a/lib/maths.h
+++ b/lib/maths.h
@@ -108,14 +108,14 @@ template<typename T>
 inline constexpr auto
 mph_to_ms(T v)
 {
-	return v / 2.237;
+	return v / 2.237L;
 }
 
 template<typename T>
 inline constexpr auto
 kph_to_ms(T v)
 {
-	return v / 3.6;
+	return v / 3.6L;
 }
 
 // ... literals are handy for now, probably go away when we load stuff externally
diff --git a/lib/persistence.cpp b/lib/persistence.cpp
index 405c7ec..5338738 100644
--- a/lib/persistence.cpp
+++ b/lib/persistence.cpp
@@ -70,7 +70,7 @@ namespace Persistence {
 	PersistenceWrite::selHandler()
 	{
 		this->sel->write(out);
-	};
+	}
 
 	void
 	PersistenceWrite::setType(const std::string_view tn, const Persistable * p)
@@ -97,7 +97,8 @@ namespace Persistence {
 		throw std::runtime_error("Unexpected bool");
 	}
 
-	void Selection::setValue(std::nullptr_t)
+	void
+	Selection::setValue(std::nullptr_t)
 	{
 		throw std::runtime_error("Unexpected null");
 	}
diff --git a/lib/persistence.h b/lib/persistence.h
index 0faa24d..5468cd3 100644
--- a/lib/persistence.h
+++ b/lib/persistence.h
@@ -176,11 +176,11 @@ namespace Persistence {
 			void
 			write(const Writer & out) const override
 			{
-				for (glm::length_t idx = 0; idx < L; idx += 1) {
-					if (idx) {
+				for (glm::length_t n = 0; n < L; n += 1) {
+					if (n) {
 						out.nextValue();
 					}
-					SelectionT<T> {this->v[idx]}.write(out);
+					SelectionT<T> {this->v[n]}.write(out);
 				}
 			}
 		};
@@ -217,11 +217,11 @@ namespace Persistence {
 			void
 			write(const Writer & out) const override
 			{
-				for (std::size_t idx = 0; idx < this->v.size(); idx += 1) {
-					if (idx) {
+				for (auto & member : this->v) {
+					if (&member != &this->v.front()) {
 						out.nextValue();
 					}
-					SelectionT<T> {this->v[idx]}.write(out);
+					SelectionT<T> {member}.write(out);
 				}
 			}
 		};
-- 
cgit v1.2.3