oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-01-04 23:50:05 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from MW0MWZ/patch-1

Browse source 
Update YSFReflectors.cpp
This commit is contained in:
Jonathan Naylor 2025-05-13 13:41:18 +01:00 committed by GitHub
parent f5a9843502 af1cfbb251
commit c3580fdcd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
YSFGateway/YSFReflectors.cpp
View file

@ -350,7 +350,7 @@ std::vector<CYSFReflector*>& CYSFReflectors::search(const std::string& name)
m_search.clear();
std::string trimmed = name;
trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), trimmed.end());
trimmed.erase(std::find_if(trimmed.rbegin(), trimmed.rend(), [](unsigned char ch) { return !std::isspace(ch); }).base(), trimmed.end());
std::transform(trimmed.begin(), trimmed.end(), trimmed.begin(), ::toupper);
// Removed now un-used variable
@ -358,13 +358,13 @@ std::vector<CYSFReflector*>& CYSFReflectors::search(const std::string& name)
for (std::vector<CYSFReflector*>::iterator it = m_currReflectors.begin(); it != m_currReflectors.end(); ++it) {
std::string reflector = (*it)->m_name;
reflector.erase(std::find_if(reflector.rbegin(), reflector.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), reflector.end());
reflector.erase(std::find_if(reflector.rbegin(), reflector.rend(),[](unsigned char ch) { return !std::isspace(ch); }).base(),reflector.end());
std::transform(reflector.begin(), reflector.end(), reflector.begin(), ::toupper);
// Original match function - only matches start of string.
// if (trimmed == reflector.substr(0U, len))
// m_search.push_back(*it);
// New match function searches the whole string
for (unsigned int refSrcPos = 0U; refSrcPos < reflector.length(); refSrcPos++) {
if (reflector.substr(refSrcPos, trimmed.length()) == trimmed) {