From 19ead93af9835accc27d2b54ec1eea0e144a189b Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Fri, 14 Mar 2025 16:31:29 +0000
Subject: [PATCH] Fix some search & replace mistakes.

---
 DMRCSBK.h              | 2 +-
 DMRDefines.h           | 4 ++--
 DMRSlot.cpp            | 4 ++--
 FMNetwork.cpp          | 4 ++--
 NXDNKenwoodNetwork.cpp | 4 ++--
 UDPSocket.cpp          | 4 ++--
 UDPSocket.h            | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/DMRCSBK.h b/DMRCSBK.h
index 42b871d..af6bffa 100644
--- a/DMRCSBK.h
+++ b/DMRCSBK.h
@@ -21,7 +21,7 @@
 
 #include "DMRDefines.h"
 
-enum class CSBKO {
+enum class CSBKO : unsigned char {
 	NONE           = 0x00,
 	UUVREQ         = 0x04,
 	UUANSRSP       = 0x05,
diff --git a/DMRDefines.h b/DMRDefines.h
index 2f38874..7c2d47f 100644
--- a/DMRDefines.h
+++ b/DMRDefines.h
@@ -110,14 +110,14 @@ const unsigned char DPF_PROPRIETARY      = 0x0FU;
 const unsigned char FID_ETSI = 0U;
 const unsigned char FID_DMRA = 16U;
 
-enum class FLCO {
+enum class FLCO : unsigned char {
 	GROUP               = 0,
 	USER_USER           = 3,
 	TALKER_ALIAS_HEADER = 4,
 	TALKER_ALIAS_BLOCK1 = 5,
 	TALKER_ALIAS_BLOCK2 = 6,
 	TALKER_ALIAS_BLOCK3 = 7,
-	GINFO            = 8
+	GPS_INFO            = 8
 };
 
 #endif
diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index 054b81b..e34ab95 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -679,7 +679,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
 					// CUtils::dump(1U, text, data, 9U);
 					break;
 
-				case FLCO::GINFO:
+				case FLCO::GPS_INFO:
 					if (m_dumpTAData) {
 						::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
 						CUtils::dump(1U, text, data, 9U);
@@ -1522,7 +1522,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 				// ::sprintf(text, "DMR Slot %u, Embedded LC", m_slotNo);
 				// CUtils::dump(1U, text, data, 9U);
 				break;
-			case FLCO::GINFO:
+			case FLCO::GPS_INFO:
 				if (m_dumpTAData) {
 					::sprintf(text, "DMR Slot %u, Embedded GPS Info", m_slotNo);
 					CUtils::dump(1U, text, data, 9U);
diff --git a/FMNetwork.cpp b/FMNetwork.cpp
index e0c784e..334b5c4 100644
--- a/FMNetwork.cpp
+++ b/FMNetwork.cpp
@@ -367,12 +367,12 @@ void CFMNetwork::clock(unsigned int ms)
 
 	// Check if the data is for us
 	if (m_protocol == FM_NETWORK_PROTOCOL::USRP) {
-		if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREAND_PORT)) {
+		if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::ADDRESS_AND_PORT)) {
 			LogMessage("FM packet received from an invalid source");
 			return;
 		}
 	} else {
-		if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::IMT_ADDREONLY)) {
+		if (!CUDPSocket::match(addr, m_addr, IPMATCHTYPE::ADDRESS_ONLY)) {
 			LogMessage("FM packet received from an invalid source");
 			return;
 		}
diff --git a/NXDNKenwoodNetwork.cpp b/NXDNKenwoodNetwork.cpp
index ca01e04..a8138b6 100644
--- a/NXDNKenwoodNetwork.cpp
+++ b/NXDNKenwoodNetwork.cpp
@@ -774,7 +774,7 @@ unsigned int CNXDNKenwoodNetwork::readRTP(unsigned char* data)
 	if (length <= 0)
 		return 0U;
 
-	if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) {
+	if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::ADDRESS_ONLY)) {
 		LogMessage("NXDN, RTP packet received from an invalid source");
 		return 0U;
 	}
@@ -802,7 +802,7 @@ unsigned int CNXDNKenwoodNetwork::readRTCP(unsigned char* data)
 	if (length <= 0)
 		return 0U;
 
-	if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::IMT_ADDREONLY)) {
+	if (!CUDPSocket::match(m_rtpAddr, address, IPMATCHTYPE::ADDRESS_ONLY)) {
 		LogMessage("NXDN, RTCP packet received from an invalid source");
 		return 0U;
 	}
diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index f81b4ff..27101fa 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -119,7 +119,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad
 	if (addr1.ss_family != addr2.ss_family)
 		return false;
 
-	if (type == IPMATCHTYPE::IMT_ADDREAND_PORT) {
+	if (type == IPMATCHTYPE::ADDRESS_AND_PORT) {
 		switch (addr1.ss_family) {
 			case AF_INET:
 				struct sockaddr_in *in_1, *in_2;
@@ -134,7 +134,7 @@ bool CUDPSocket::match(const sockaddr_storage& addr1, const sockaddr_storage& ad
 			default:
 				return false;
 		}
-	} else if (type == IPMATCHTYPE::IMT_ADDREONLY) {
+	} else if (type == IPMATCHTYPE::ADDRESS_ONLY) {
 		switch (addr1.ss_family) {
 			case AF_INET:
 				struct sockaddr_in *in_1, *in_2;
diff --git a/UDPSocket.h b/UDPSocket.h
index fc0c422..3f33611 100644
--- a/UDPSocket.h
+++ b/UDPSocket.h
@@ -37,8 +37,8 @@
 #endif
 
 enum class IPMATCHTYPE {
-	IMT_ADDREAND_PORT,
-	IMT_ADDREONLY
+	ADDRESS_AND_PORT,
+	ADDRESS_ONLY
 };
 
 class CUDPSocket {
@@ -61,7 +61,7 @@ public:
 	static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength);
 	static int lookup(const std::string& hostName, unsigned short port, sockaddr_storage& address, unsigned int& addressLength, struct addrinfo& hints);
 
-	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IPMATCHTYPE::IMT_ADDREAND_PORT);
+	static bool match(const sockaddr_storage& addr1, const sockaddr_storage& addr2, IPMATCHTYPE type = IPMATCHTYPE::ADDRESS_AND_PORT);
 
 	static bool isNone(const sockaddr_storage& addr);