Static analysis fixes

5 files changed, 9 insertions, 9 deletions

diff --git a/src/Fans/FansManager.cpp b/src/Fans/FansManager.cpp
index 4efd7345..e944938c 100644
--- a/src/Fans/FansManager.cpp
+++ b/src/Fans/FansManager.cpp
@@ -42,7 +42,7 @@ ReadLockedPointer<Fan> FansManager::FindFan(size_t fanNum) const noexcept
 }
 
 // Create and return a local fan. if it fails, return nullptr with the error message in 'reply'.
-LocalFan *FansManager::CreateLocalFan(uint32_t fanNum, const char *pinNames, PwmFrequency freq, const StringRef& reply) noexcept
+LocalFan *FansManager::CreateLocalFan(uint32_t fanNum, const char *_ecv_array pinNames, PwmFrequency freq, const StringRef& reply) noexcept
 {
 	LocalFan *newFan = new LocalFan(fanNum);
 	if (!newFan->AssignPorts(pinNames, reply))
@@ -219,7 +219,7 @@ bool FansManager::IsFanControllable(size_t fanNum) const noexcept
 }
 
 // Return the fan's name
-const char *FansManager::GetFanName(size_t fanNum) const noexcept
+const char *_ecv_array FansManager::GetFanName(size_t fanNum) const noexcept
 {
 	auto fan = FindFan(fanNum);
 	return (fan.IsNull()) ? "" : fan->GetName();
diff --git a/src/Fans/FansManager.h b/src/Fans/FansManager.h
index 0bcc6702..c8863364 100644
--- a/src/Fans/FansManager.h
+++ b/src/Fans/FansManager.h
@@ -36,7 +36,7 @@ public:
 	float SetFanValue(size_t fanNum, float speed) noexcept;
 	float SetFansValue(FansBitmap whichFans, float speed) noexcept;
 	bool IsFanControllable(size_t fanNum) const noexcept;
-	const char *GetFanName(size_t fanNum) const noexcept;
+	const char *_ecv_array GetFanName(size_t fanNum) const noexcept;
 	int32_t GetFanRPM(size_t fanNum) const noexcept;
 #if SUPPORT_CAN_EXPANSION
 	void ProcessRemoteFanRpms(CanAddress src, const CanMessageFansReport& msg) noexcept;
@@ -58,7 +58,7 @@ public:
 	static ReadWriteLock fansLock;
 
 private:
-	LocalFan *CreateLocalFan(uint32_t fanNum, const char *pinNames, PwmFrequency freq, const StringRef& reply) noexcept;
+	LocalFan *CreateLocalFan(uint32_t fanNum, const char *_ecv_array pinNames, PwmFrequency freq, const StringRef& reply) noexcept;
 
 	Fan *_ecv_from fans[MaxFans];
 };
diff --git a/src/Platform/MessageType.h b/src/Platform/MessageType.h
index 70072808..482732bb 100644
--- a/src/Platform/MessageType.h
+++ b/src/Platform/MessageType.h
@@ -32,7 +32,7 @@ enum MessageType : uint32_t
 	BlockingUsbMessage =	   0x10000u,	// A message that is to be sent to USB in blocking mode
 	ImmediateAuxMessage =	   0x20000u,	// A message that is to be sent to LCD in immediate mode
 
-	DestinationsMask =		   0x308FFu, // Mask for all the destinations
+	DestinationsMask =		   0x308FFu, 	// Mask for all the destinations
 
 	// Special indicators (byte 4)
 	// The first two are not processed when calling the version of Platform::Message that takes an OutputBuffer.
diff --git a/src/RepRapFirmware.h b/src/RepRapFirmware.h
index fbe2f588..798c66d2 100644
--- a/src/RepRapFirmware.h
+++ b/src/RepRapFirmware.h
@@ -431,17 +431,17 @@ private:
 };
 
 // Function to delete an object and clear the pointer. Safe to call even if the pointer is already null.
-template <typename T> void DeleteObject(T*& ptr) noexcept
+template <typename T> void DeleteObject(T *null & ptr) noexcept
 {
-	T* p2 = nullptr;
+	T *null p2 = nullptr;
 	std::swap(ptr, p2);
 	delete p2;
 }
 
 // Function to make a pointer point to a new object and delete the existing object, if any. T2 must be the same as T or derived from it.
-template <typename T, typename T2> void ReplaceObject(T*& ptr, T2* pNew) noexcept
+template <typename T, typename T2> void ReplaceObject(T *null & ptr, T2* pNew) noexcept
 {
-	T* p2 = pNew;
+	T *null p2 = static_cast<T *null>(pNew);
 	std::swap(ptr, p2);
 	delete p2;
 }
diff --git a/src/RepRapFirmware.pdp b/src/RepRapFirmware.pdp
index 199d2645..9c58837f 100644
--- a/src/RepRapFirmware.pdp
+++ b/src/RepRapFirmware.pdp