From ddeb81a60035ae6d7a060260e772bf18b7b481fd Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 22 Dec 2016 09:14:39 +0000
Subject: [PATCH] Initialise variables properly and restructure.

---
 DMRAccessControl.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp
index 152bb7d..8fd529f 100644
--- a/DMRAccessControl.cpp
+++ b/DMRAccessControl.cpp
@@ -33,29 +33,31 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
 {
 	m_blackList = blacklist;
 	m_whiteList = whitelist;
+	m_selfOnly  = selfOnly;
+	m_prefixes  = prefixes;
+	m_id        = id;
 }
  
 bool CDMRAccessControl::validateId(unsigned int id)
 {
-	if (m_selfOnly) {
+	if (m_selfOnly)
 		return id == m_id;
-	} else {
-		if (std::find(m_blackList.begin(), m_blackList.end(), id) != m_blackList.end())
+
+	if (std::find(m_blackList.begin(), m_blackList.end(), id) != m_blackList.end())
+		return false;
+
+	unsigned int prefix = id / 10000U;
+	if (prefix == 0U || prefix > 999U)
+		return false;
+
+	if (!m_prefixes.empty()) {
+		bool ret = std::find(m_prefixes.begin(), m_prefixes.end(), prefix) == m_prefixes.end();
+		if (ret)
 			return false;
-
-		unsigned int prefix = id / 10000U;
-		if (prefix == 0U || prefix > 999U)
-			return false;
-
-		if (!m_prefixes.empty()) {
-			bool ret = std::find(m_prefixes.begin(), m_prefixes.end(), prefix) == m_prefixes.end();
-			if (ret)
-				return false;
-		}
-
-		if (!m_whiteList.empty())
-			return std::find(m_whiteList.begin(), m_whiteList.end(), id) != m_whiteList.end();
-
-		return true;
 	}
+
+	if (!m_whiteList.empty())
+		return std::find(m_whiteList.begin(), m_whiteList.end(), id) != m_whiteList.end();
+
+	return true;
 }