lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bab.cpp: code modernization 

* Use for range based loops
* Simplify some tests
* Code style fixes
master
Loic Blot 2017-08-15 09:39:58 +02:00
parent 342e9336ae
commit 64c7a689ad
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ban.cpp
View File

@ -48,14 +48,12 @@ void BanManager::load()
MutexAutoLock lock(m_mutex); MutexAutoLock lock(m_mutex);
infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl; infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
std::ifstream is(m_banfilepath.c_str(), std::ios::binary); std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
if(is.good() == false) if (!is.good()) {
{
infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl; infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
throw SerializationError("BanManager::load(): Couldn't open file"); throw SerializationError("BanManager::load(): Couldn't open file");
} }
while(!is.eof() && is.good()) while (!is.eof() && is.good()) {
{
std::string line; std::string line;
std::getline(is, line, '\n'); std::getline(is, line, '\n');
Strfnd f(line); Strfnd f(line);
@ -74,8 +72,8 @@ void BanManager::save()
infostream << "BanManager: saving to " << m_banfilepath << std::endl; infostream << "BanManager: saving to " << m_banfilepath << std::endl;
std::ostringstream ss(std::ios_base::binary); std::ostringstream ss(std::ios_base::binary);
for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it) for (const auto &ip : m_ips)
ss << it->first << "|" << it->second << "\n"; ss << ip.first << "|" << ip.second << "\n";
if (!fs::safeWriteToFile(m_banfilepath, ss.str())) { if (!fs::safeWriteToFile(m_banfilepath, ss.str())) {
infostream << "BanManager: failed saving to " << m_banfilepath << std::endl; infostream << "BanManager: failed saving to " << m_banfilepath << std::endl;
@ -94,11 +92,11 @@ bool BanManager::isIpBanned(const std::string &ip)
std::string BanManager::getBanDescription(const std::string &ip_or_name) std::string BanManager::getBanDescription(const std::string &ip_or_name)
{ {
MutexAutoLock lock(m_mutex); MutexAutoLock lock(m_mutex);
std::string s = ""; std::string s;
for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it) { for (const auto &ip : m_ips) {
if (it->first == ip_or_name || it->second == ip_or_name if (ip.first == ip_or_name || ip.second == ip_or_name
|| ip_or_name == "") { || ip_or_name.empty()) {
s += it->first + "|" + it->second + ", "; s += ip.first + "|" + ip.second + ", ";
} }
} }
s = s.substr(0, s.size() - 2); s = s.substr(0, s.size() - 2);