From 4fe1c11250bf8908571ecaabe6c8bf6b599d582f Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sat, 25 Apr 2020 17:29:10 +0100
Subject: [PATCH] Remove memory leak and other configuration funnies.

---
 FM.cpp        | 8 ++++----
 FMCTCSSTX.cpp | 4 +---
 FMKeyer.cpp   | 7 +++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/FM.cpp b/FM.cpp
index 7f0beb0..d3e9a1a 100644
--- a/FM.cpp
+++ b/FM.cpp
@@ -46,11 +46,11 @@ m_rxBoost(1U)
 
 void CFM::samples(bool cos, q15_t* samples, uint8_t length)
 {
-  uint8_t i = 0;
-  for (; i < length; i++) {
-    if (!m_useCOS)
-      cos = true;
+  if (!m_useCOS)
+    cos = true;
 
+  uint8_t i = 0U;
+  for (; i < length; i++) {
     q15_t currentSample = samples[i];//save to a local variable to avoid indirection on every access
 
     CTCSSState ctcssState = m_ctcssRX.process(currentSample);
diff --git a/FMCTCSSTX.cpp b/FMCTCSSTX.cpp
index 7b45c1e..e513d70 100644
--- a/FMCTCSSTX.cpp
+++ b/FMCTCSSTX.cpp
@@ -102,9 +102,7 @@ uint8_t CFMCTCSSTX::setParams(uint8_t frequency, uint8_t level)
 
   m_length = entry->length;
 
-  if (m_values)
-    delete[] m_values;
-
+  delete[] m_values;
   m_values = new q15_t[m_length];
 
   q15_t arg = 0;
diff --git a/FMKeyer.cpp b/FMKeyer.cpp
index a779d0e..36a2815 100644
--- a/FMKeyer.cpp
+++ b/FMKeyer.cpp
@@ -92,7 +92,8 @@ m_lowLevel(0)
 
 uint8_t CFMKeyer::setParams(const char* text, uint8_t speed, uint16_t frequency, uint8_t highLevel, uint8_t lowLevel)
 {
-  m_poLen=0;
+  m_poLen = 0U;
+
   for (uint8_t i = 0U; text[i] != '\0'; i++) {
     for (uint8_t j = 0U; SYMBOL_LIST[j].c != 0U; j++) {
       if (SYMBOL_LIST[j].c == text[i]) {
@@ -119,9 +120,7 @@ uint8_t CFMKeyer::setParams(const char* text, uint8_t speed, uint16_t frequency,
 
   m_audioLen = 24000U / frequency; // In samples
 
-  if (m_audio)
-    delete[] m_audio;
-
+  delete[] m_audio;
   m_audio = new bool[m_audioLen];
 
   for (uint16_t i = 0U; i < m_audioLen; i++) {