Remove unnecessary bool return types

diff --git a/src/database/database-dummy.cpp b/src/database/database-dummy.cpp
index 9fa325b93ea2a8d872cd047880617e5f25c5c0b0..19cb6e4fa1cbcdb9fc29c085c7eac85007f385ef 100644 (file)
--- a/src/database/database-dummy.cpp
+++ b/src/database/database-dummy.cpp
@@ -81,7 +81,7 @@ void Database_Dummy::listPlayers(std::vector<std::string> &res)
        }
 }
 
-bool Database_Dummy::getModEntries(const std::string &modname, StringMap *storage)
+void Database_Dummy::getModEntries(const std::string &modname, StringMap *storage)
 {
        const auto mod_pair = m_mod_storage_database.find(modname);
        if (mod_pair != m_mod_storage_database.cend()) {
@@ -89,10 +89,9 @@ bool Database_Dummy::getModEntries(const std::string &modname, StringMap *storag
                        (*storage)[pair.first] = pair.second;
                }
        }
-       return true;
 }
 
-bool Database_Dummy::getModKeys(const std::string &modname, std::vector<std::string> *storage)
+void Database_Dummy::getModKeys(const std::string &modname, std::vector<std::string> *storage)
 {
        const auto mod_pair = m_mod_storage_database.find(modname);
        if (mod_pair != m_mod_storage_database.cend()) {
@@ -100,7 +99,6 @@ bool Database_Dummy::getModKeys(const std::string &modname, std::vector<std::str
                for (const auto &pair : mod_pair->second)
                        storage->push_back(pair.first);
        }
-       return true;
 }
 
 bool Database_Dummy::getModEntry(const std::string &modname,

diff --git a/src/database/database-dummy.h b/src/database/database-dummy.h
index 42964b5bc5173e1b4660d6c19dbf1458eec84bca..ecfa82c347090ddaf75d2b06621a7d6c9cf48973 100644 (file)
--- a/src/database/database-dummy.h
+++ b/src/database/database-dummy.h
@@ -37,8 +37,8 @@ class Database_Dummy : public MapDatabase, public PlayerDatabase, public ModStor
        bool removePlayer(const std::string &name);
        void listPlayers(std::vector<std::string> &res);
 
-       bool getModEntries(const std::string &modname, StringMap *storage);
-       bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
+       void getModEntries(const std::string &modname, StringMap *storage);
+       void getModKeys(const std::string &modname, std::vector<std::string> *storage);
        bool getModEntry(const std::string &modname,
                        const std::string &key, std::string *value);
        bool hasModEntry(const std::string &modname, const std::string &key);

diff --git a/src/database/database-files.cpp b/src/database/database-files.cpp
index e90a50619ba8aef917c164bc2c5bb7216ecfe372..5b41f6c192b452d1e1851e2390525b5962b1e869 100644 (file)
--- a/src/database/database-files.cpp
+++ b/src/database/database-files.cpp
@@ -381,34 +381,30 @@ ModStorageDatabaseFiles::ModStorageDatabaseFiles(const std::string &savedir):
 {
 }
 
-bool ModStorageDatabaseFiles::getModEntries(const std::string &modname, StringMap *storage)
+void ModStorageDatabaseFiles::getModEntries(const std::string &modname, StringMap *storage)
 {
        Json::Value *meta = getOrCreateJson(modname);
        if (!meta)
-               return false;
+               return;
 
        const Json::Value::Members attr_list = meta->getMemberNames();
        for (const auto &it : attr_list) {
                Json::Value attr_value = (*meta)[it];
                (*storage)[it] = attr_value.asString();
        }
-
-       return true;
 }
 
-bool ModStorageDatabaseFiles::getModKeys(const std::string &modname,
+void ModStorageDatabaseFiles::getModKeys(const std::string &modname,
                std::vector<std::string> *storage)
 {
        Json::Value *meta = getOrCreateJson(modname);
        if (!meta)
-               return false;
+               return;
 
        std::vector<std::string> keys = meta->getMemberNames();
        storage->reserve(storage->size() + keys.size());
        for (std::string &key : keys)
                storage->push_back(std::move(key));
-
-       return true;
 }
 
 bool ModStorageDatabaseFiles::getModEntry(const std::string &modname,

diff --git a/src/database/database-files.h b/src/database/database-files.h
index 20b0b5896cd94b8538caee1c418cb63197439f73..09116b2b466ed9549c320a502457709001b2b68b 100644 (file)
--- a/src/database/database-files.h
+++ b/src/database/database-files.h
@@ -78,8 +78,8 @@ class ModStorageDatabaseFiles : public ModStorageDatabase
        ModStorageDatabaseFiles(const std::string &savedir);
        virtual ~ModStorageDatabaseFiles() = default;
 
-       virtual bool getModEntries(const std::string &modname, StringMap *storage);
-       virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
+       virtual void getModEntries(const std::string &modname, StringMap *storage);
+       virtual void getModKeys(const std::string &modname, std::vector<std::string> *storage);
        virtual bool getModEntry(const std::string &modname,
                const std::string &key, std::string *value);
        virtual bool hasModEntry(const std::string &modname, const std::string &key);

diff --git a/src/database/database-postgresql.cpp b/src/database/database-postgresql.cpp
index 1c51a8d85a1da6e24ad529e1f60917bf89e0eadd..d84b26b55f1cc12ab68e98ccfc9b768ac87d4e30 100644 (file)
--- a/src/database/database-postgresql.cpp
+++ b/src/database/database-postgresql.cpp
@@ -866,7 +866,7 @@ void ModStorageDatabasePostgreSQL::initStatements()
                "SELECT DISTINCT modname FROM mod_storage");
 }
 
-bool ModStorageDatabasePostgreSQL::getModEntries(const std::string &modname, StringMap *storage)
+void ModStorageDatabasePostgreSQL::getModEntries(const std::string &modname, StringMap *storage)
 {
        verifyDatabase();
 
@@ -882,11 +882,9 @@ bool ModStorageDatabasePostgreSQL::getModEntries(const std::string &modname, Str
                (*storage)[pg_to_string(results, row, 0)] = pg_to_string(results, row, 1);
 
        PQclear(results);
-
-       return true;
 }
 
-bool ModStorageDatabasePostgreSQL::getModKeys(const std::string &modname,
+void ModStorageDatabasePostgreSQL::getModKeys(const std::string &modname,
                std::vector<std::string> *storage)
 {
        verifyDatabase();
@@ -904,8 +902,6 @@ bool ModStorageDatabasePostgreSQL::getModKeys(const std::string &modname,
                storage->push_back(pg_to_string(results, row, 0));
 
        PQclear(results);
-
-       return true;
 }
 
 bool ModStorageDatabasePostgreSQL::getModEntry(const std::string &modname,

diff --git a/src/database/database-postgresql.h b/src/database/database-postgresql.h
index a587f3d9ef5eda5fc09b3a1b7805df463323224d..56b3d6b530df45cec5a17d69e30200f77b0a06f3 100644 (file)
--- a/src/database/database-postgresql.h
+++ b/src/database/database-postgresql.h
@@ -181,8 +181,8 @@ class ModStorageDatabasePostgreSQL : private Database_PostgreSQL, public ModStor
        ModStorageDatabasePostgreSQL(const std::string &connect_string);
        ~ModStorageDatabasePostgreSQL() = default;
 
-       bool getModEntries(const std::string &modname, StringMap *storage);
-       bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
+       void getModEntries(const std::string &modname, StringMap *storage);
+       void getModKeys(const std::string &modname, std::vector<std::string> *storage);
        bool getModEntry(const std::string &modname, const std::string &key, std::string *value);
        bool hasModEntry(const std::string &modname, const std::string &key);
        bool setModEntry(const std::string &modname,

diff --git a/src/database/database-sqlite3.cpp b/src/database/database-sqlite3.cpp
index 636864d82fae7b9bb992a15207ad038ca53e3325..7b4b6ddbe78684f466d7542aea9bbd6302e2b41b 100644 (file)
--- a/src/database/database-sqlite3.cpp
+++ b/src/database/database-sqlite3.cpp
@@ -808,7 +808,7 @@ void ModStorageDatabaseSQLite3::initStatements()
        PREPARE_STATEMENT(remove_all, "DELETE FROM `entries` WHERE `modname` = ?");
 }
 
-bool ModStorageDatabaseSQLite3::getModEntries(const std::string &modname, StringMap *storage)
+void ModStorageDatabaseSQLite3::getModEntries(const std::string &modname, StringMap *storage)
 {
        verifyDatabase();
 
@@ -823,11 +823,9 @@ bool ModStorageDatabaseSQLite3::getModEntries(const std::string &modname, String
        sqlite3_vrfy(sqlite3_errcode(m_database), SQLITE_DONE);
 
        sqlite3_reset(m_stmt_get_all);
-
-       return true;
 }
 
-bool ModStorageDatabaseSQLite3::getModKeys(const std::string &modname,
+void ModStorageDatabaseSQLite3::getModKeys(const std::string &modname,
                std::vector<std::string> *storage)
 {
        verifyDatabase();
@@ -841,8 +839,6 @@ bool ModStorageDatabaseSQLite3::getModKeys(const std::string &modname,
        sqlite3_vrfy(sqlite3_errcode(m_database), SQLITE_DONE);
 
        sqlite3_reset(m_stmt_get_keys);
-
-       return true;
 }
 
 bool ModStorageDatabaseSQLite3::getModEntry(const std::string &modname,

diff --git a/src/database/database-sqlite3.h b/src/database/database-sqlite3.h
index 3eaacbe119ca0d21740f89a601eaa458ade9c70e..a400537ff7df800a5830aef14b29869c1d89973b 100644 (file)
--- a/src/database/database-sqlite3.h
+++ b/src/database/database-sqlite3.h
@@ -239,8 +239,8 @@ class ModStorageDatabaseSQLite3 : private Database_SQLite3, public ModStorageDat
        ModStorageDatabaseSQLite3(const std::string &savedir);
        virtual ~ModStorageDatabaseSQLite3();
 
-       virtual bool getModEntries(const std::string &modname, StringMap *storage);
-       virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
+       virtual void getModEntries(const std::string &modname, StringMap *storage);
+       virtual void getModKeys(const std::string &modname, std::vector<std::string> *storage);
        virtual bool getModEntry(const std::string &modname,
                const std::string &key, std::string *value);
        virtual bool hasModEntry(const std::string &modname, const std::string &key);

diff --git a/src/database/database.h b/src/database/database.h
index 123cdadda192646059a875d27b35a01f9107495e..84912e795dbe2f33c98b72cdcf66a37e03300944 100644 (file)
--- a/src/database/database.h
+++ b/src/database/database.h
@@ -91,8 +91,8 @@ class ModStorageDatabase : public Database
 public:
        virtual ~ModStorageDatabase() = default;
 
-       virtual bool getModEntries(const std::string &modname, StringMap *storage) = 0;
-       virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage) = 0;
+       virtual void getModEntries(const std::string &modname, StringMap *storage) = 0;
+       virtual void getModKeys(const std::string &modname, std::vector<std::string> *storage) = 0;
        virtual bool hasModEntry(const std::string &modname, const std::string &key) = 0;
        virtual bool getModEntry(const std::string &modname,
                const std::string &key, std::string *value) = 0;