Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / ban.cpp

diff --git a/src/ban.cpp b/src/ban.cpp
index 7c1a68d458af2d330150198c8d812dc1d79df0c9..7a7fb8c3c7219af0f9b01439cd94ce6ff32898d6 100644 (file)
--- a/src/ban.cpp
+++ b/src/ban.cpp
@@ -19,24 +19,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "ban.h"
 #include <fstream>
-#include "jthread/jmutexautolock.h"
+#include "threading/mutex_auto_lock.h"
 #include <sstream>
 #include <set>
-#include "strfnd.h"
+#include "util/strfnd.h"
 #include "util/string.h"
 #include "log.h"
 #include "filesys.h"
 
 BanManager::BanManager(const std::string &banfilepath):
-               m_banfilepath(banfilepath),
-               m_modified(false)
+               m_banfilepath(banfilepath)
 {
-       try{
+       try {
                load();
-       }
-       catch(SerializationError &e)
-       {
-               infostream<<"WARNING: BanManager: creating "
+       } catch(SerializationError &e) {
+               warningstream<<"BanManager: creating "
                                <<m_banfilepath<<std::endl;
        }
 }
@@ -48,7 +45,7 @@ BanManager::~BanManager()
 
 void BanManager::load()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        infostream<<"BanManager: loading from "<<m_banfilepath<<std::endl;
        std::ifstream is(m_banfilepath.c_str(), std::ios::binary);
        if(is.good() == false)
@@ -73,7 +70,7 @@ void BanManager::load()
 
 void BanManager::save()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        infostream << "BanManager: saving to " << m_banfilepath << std::endl;
        std::ostringstream ss(std::ios_base::binary);
 
@@ -90,13 +87,13 @@ void BanManager::save()
 
 bool BanManager::isIpBanned(const std::string &ip)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        return m_ips.find(ip) != m_ips.end();
 }
 
 std::string BanManager::getBanDescription(const std::string &ip_or_name)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        std::string s = "";
        for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it) {
                if (it->first  == ip_or_name || it->second == ip_or_name
@@ -110,7 +107,7 @@ std::string BanManager::getBanDescription(const std::string &ip_or_name)
 
 std::string BanManager::getBanName(const std::string &ip)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        StringMap::iterator it = m_ips.find(ip);
        if (it == m_ips.end())
                return "";
@@ -119,14 +116,14 @@ std::string BanManager::getBanName(const std::string &ip)
 
 void BanManager::add(const std::string &ip, const std::string &name)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        m_ips[ip] = name;
        m_modified = true;
 }
 
 void BanManager::remove(const std::string &ip_or_name)
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        for (StringMap::iterator it = m_ips.begin(); it != m_ips.end();) {
                if ((it->first == ip_or_name) || (it->second == ip_or_name)) {
                        m_ips.erase(it++);
@@ -140,7 +137,7 @@ void BanManager::remove(const std::string &ip_or_name)
 
 bool BanManager::isModified()
 {
-       JMutexAutoLock lock(m_mutex);
+       MutexAutoLock lock(m_mutex);
        return m_modified;
 }