dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Simplify the reflector access method.

Browse source
This commit is contained in:
Jonathan Naylor 2016-09-30 11:09:24 +01:00 committed by GitHub
parent 9ee69cd555
commit d51dc57e28
1 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
YSFGateway/Reflectors.cpp
View file

@ -29,7 +29,6 @@
CReflectors::CReflectors(const std::string& hostsFile, unsigned int reloadTime) :
m_hostsFile(hostsFile),
m_reflectors(),
m_current(),
m_search(),
m_timer(1000U, reloadTime * 60U)
{
@ -43,6 +42,23 @@ CReflectors::~CReflectors()
delete *it;
}
static bool refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
{
assert(r1 != NULL);
assert(r2 != NULL);
std::string name1 = r1->m_name;
std::string name2 = r2->m_name;
for (unsigned int i = 0U; i < 16U; i++) {
int c = ::toupper(name1.at(i)) - ::toupper(name2.at(i));
if (c != 0)
return c < 0;
}
return false;
}
bool CReflectors::load()
{
FILE* fp = ::fopen(m_hostsFile.c_str(), "rt");
@ -91,6 +107,8 @@ bool CReflectors::load()
if (size == 0U)
return false;
std::sort(m_reflectors.begin(), m_reflectors.end(), refComparison);
LogInfo("Loaded %u YSF reflectors", size);
return true;
@ -108,33 +126,9 @@ CYSFReflector* CReflectors::find(const std::string& id)
return NULL;
}
static bool refComparison(const CYSFReflector* r1, const CYSFReflector* r2)
{
assert(r1 != NULL);
assert(r2 != NULL);
std::string name1 = r1->m_name;
std::string name2 = r2->m_name;
for (unsigned int i = 0U; i < 16U; i++) {
int c = ::toupper(name1.at(i)) - ::toupper(name2.at(i));
if (c != 0)
return c < 0;
}
return false;
}
std::vector<CYSFReflector*>& CReflectors::current()
{
m_current.clear();
for (std::vector<CYSFReflector*>::iterator it = m_reflectors.begin(); it != m_reflectors.end(); ++it)
m_current.push_back(*it);
std::sort(m_current.begin(), m_current.end(), refComparison);
return m_current;
return m_reflectors;
}
std::vector<CYSFReflector*>& CReflectors::search(const std::string& name)