From 95d83fd9cee0891eb0398d8eb89ade461eba7226 Mon Sep 17 00:00:00 2001 From: Antonio Matraia <63372602+iu5jae@users.noreply.github.com> Date: Wed, 26 Jul 2023 22:02:47 +0200 Subject: [PATCH] Requested changes Changed indentation from space to tab, used false instead of 0 for boolean variables. --- YSFGateway/Conf.cpp | 2 +- YSFGateway/WiresX.cpp | 8 ++++---- YSFGateway/YSFGateway.cpp | 22 +++++++++++----------- YSFGateway/YSFReflectors.cpp | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/YSFGateway/Conf.cpp b/YSFGateway/Conf.cpp index a0e445b..55ac4db 100644 --- a/YSFGateway/Conf.cpp +++ b/YSFGateway/Conf.cpp @@ -276,7 +276,7 @@ bool CConf::read() m_ysfNetworkYSF2P25Address = value; else if (::strcmp(key, "YSF2P25Port") == 0) m_ysfNetworkYSF2P25Port = (unsigned short)::atoi(value); - else if (::strcmp(key, "YSFDirectAddress") == 0) + else if (::strcmp(key, "YSFDirectAddress") == 0) m_ysfNetworkYSFDirectAddress = value; else if (::strcmp(key, "YSFDirectPort") == 0) m_ysfNetworkYSFDirectPort = (unsigned short)::atoi(value); diff --git a/YSFGateway/WiresX.cpp b/YSFGateway/WiresX.cpp index 1be96fe..f2d9304 100644 --- a/YSFGateway/WiresX.cpp +++ b/YSFGateway/WiresX.cpp @@ -378,11 +378,11 @@ WX_STATUS CWiresX::processConnect(const unsigned char* source, const unsigned ch std::string id = std::string((char*)data, 5U); - CYSFReflector* reflector_tmp; + CYSFReflector* reflector_tmp; reflector_tmp = m_reflectors.findById(id); - if (reflector_tmp != NULL) - m_reflector = reflector_tmp; - + if (reflector_tmp != NULL) + m_reflector = reflector_tmp; + if (m_reflector == NULL) return WXS_NONE; diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp index 25b93d1..f051dda 100644 --- a/YSFGateway/YSFGateway.cpp +++ b/YSFGateway/YSFGateway.cpp @@ -283,10 +283,10 @@ int CYSFGateway::run() unsigned char dt = fich.getDT(); CYSFReflector* reflector = m_wiresX->getReflector(); - if (reflector != NULL) - wx_tmp = reflector->m_wiresX; - else - wx_tmp = 0; + if (reflector != NULL) + wx_tmp = reflector->m_wiresX; + else + wx_tmp = false; if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wiresXCommandPassthrough && wx_tmp) { processDTMF(buffer, dt); processWiresX(buffer, fich, true, wiresXCommandPassthrough); @@ -294,10 +294,10 @@ int CYSFGateway::run() processDTMF(buffer, dt); processWiresX(buffer, fich, false, wiresXCommandPassthrough); reflector = m_wiresX->getReflector(); //reflector may have changed - if (reflector != NULL) - wx_tmp = reflector->m_wiresX; - else - wx_tmp = 0; + if (reflector != NULL) + wx_tmp = reflector->m_wiresX; + else + wx_tmp = false; if (m_ysfNetwork != NULL && m_linkType == LINK_YSF && wx_tmp) m_exclude = (dt == YSF_DT_DATA_FR_MODE); } @@ -840,7 +840,7 @@ void CYSFGateway::startupLinking() m_linkType = LINK_NONE; CYSFReflector* reflector = m_reflectors->findByName(m_startup); - if (reflector == NULL) + if (reflector == NULL) reflector = m_reflectors->findById(m_startup); if (reflector != NULL) { LogMessage("Automatic (re-)connection to %5.5s - \"%s\"", reflector->m_id.c_str(), reflector->m_name.c_str()); @@ -903,7 +903,7 @@ void CYSFGateway::processRemoteCommands() std::string id = std::string((char*)(buffer + 7U)); // Left trim // id.erase(id.begin(), std::find_if(id.begin(), id.end(), std::not1(std::ptr_fun(std::isspace)))); - id.erase(std::remove_if(id.begin(), id.end(), [](char c) { return !std::isalnum(c); }), id.end()); + id.erase(std::remove_if(id.begin(), id.end(), [](char c) { return !std::isalnum(c); }), id.end()); CYSFReflector* reflector = m_reflectors->findById(id); if (reflector == NULL) reflector = m_reflectors->findByName(id); @@ -935,7 +935,7 @@ void CYSFGateway::processRemoteCommands() std::string raw = std::string((char*)(buffer + 7U)); // Left trim // raw.erase(raw.begin(), std::find_if(raw.begin(), raw.end(), std::not1(std::ptr_fun(std::isspace)))); - raw.erase(std::remove_if(raw.begin(), raw.end(), [](char c) { return !std::isalnum(c); }), raw.end()); + raw.erase(std::remove_if(raw.begin(), raw.end(), [](char c) { return !std::isalnum(c); }), raw.end()); std::string id = "FCS00"; std::string idShort = "FCS"; if (raw.length() == 3U) { diff --git a/YSFGateway/YSFReflectors.cpp b/YSFGateway/YSFReflectors.cpp index cdf0401..ed0c0c0 100644 --- a/YSFGateway/YSFReflectors.cpp +++ b/YSFGateway/YSFReflectors.cpp @@ -260,7 +260,7 @@ bool CYSFReflectors::load() } } - // Add the YSFDirect entry + // Add the YSFDirect entry if (m_YSFDirectPort > 0U) { sockaddr_storage addr; unsigned int addrLen; @@ -283,8 +283,8 @@ bool CYSFReflectors::load() } } - - + + unsigned int id = 9U; for (std::vector>::const_iterator it1 = m_fcsRooms.cbegin(); it1 != m_fcsRooms.cend(); ++it1) { bool used;