diff options
Diffstat (limited to 'modules/database')
-rw-r--r-- | modules/database/db_flatfile.cpp | 7 | ||||
-rw-r--r-- | modules/database/db_old.cpp | 2 | ||||
-rw-r--r-- | modules/database/db_plain.cpp | 7 | ||||
-rw-r--r-- | modules/database/db_sql.cpp | 10 | ||||
-rw-r--r-- | modules/database/db_sql_live_read.cpp | 12 | ||||
-rw-r--r-- | modules/database/db_sql_live_write.cpp | 84 |
6 files changed, 62 insertions, 60 deletions
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 795d0d909..5442e096f 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -11,6 +11,7 @@ /*************************************************************************/ #include "module.h" +#include <unistd.h> Anope::string DatabaseFile; @@ -73,13 +74,13 @@ class DBFlatFile : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; DatabaseFile = config.ReadValue("db_flatfile", "database", "anope.db", 0); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { std::fstream db; db.open(DatabaseFile.c_str(), std::ios_base::in); @@ -134,7 +135,7 @@ class DBFlatFile : public Module } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { BackupDatabase(); diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index d699e1a5f..45d6aaaea 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -1008,7 +1008,7 @@ class DBOld : public Module throw ModuleException("Invalid hash method"); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { LoadNicks(); LoadVHosts(); diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp index 7f88ae9c1..dcbfeaa28 100644 --- a/modules/database/db_plain.cpp +++ b/modules/database/db_plain.cpp @@ -12,6 +12,7 @@ #include "module.h" #include "../commands/os_session.h" +#include <unistd.h> Anope::string DatabaseFile; std::stringstream db_buffer; @@ -642,13 +643,13 @@ class DBPlain : public Module } } - void OnReload() + void OnReload() anope_override { ConfigReader config; DatabaseFile = config.ReadValue("db_plain", "database", "anope.db", 0); } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { ReadDatabase(); @@ -659,7 +660,7 @@ class DBPlain : public Module } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { BackupDatabase(); diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 6022418de..c8379ca12 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -16,12 +16,12 @@ class SQLSQLInterface : public SQLInterface public: SQLSQLInterface(Module *o) : SQLInterface(o) { } - void OnResult(const SQLResult &r) + void OnResult(const SQLResult &r) anope_override { Log(LOG_DEBUG) << "SQL successfully executed query: " << r.finished_query; } - void OnError(const SQLResult &r) + void OnError(const SQLResult &r) anope_override { if (!r.GetQuery().query.empty()) Log(LOG_DEBUG) << "Error executing query " << r.finished_query << ": " << r.GetError(); @@ -111,14 +111,14 @@ class DBSQL : public Module this->OnReload(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->sql = service_reference<SQLProvider>("SQLProvider", engine); } - EventReturn OnSaveDatabase() + EventReturn OnSaveDatabase() anope_override { if (!this->sql) { @@ -157,7 +157,7 @@ class DBSQL : public Module return EVENT_CONTINUE; } - EventReturn OnLoadDatabase() + EventReturn OnLoadDatabase() anope_override { if (!this->sql) { diff --git a/modules/database/db_sql_live_read.cpp b/modules/database/db_sql_live_read.cpp index e79e4c27d..38e5f6fef 100644 --- a/modules/database/db_sql_live_read.cpp +++ b/modules/database/db_sql_live_read.cpp @@ -19,7 +19,7 @@ class SQLCache : public Timer return false; } - void Tick(time_t) + void Tick(time_t) anope_override { for (cache_map::iterator it = this->cache.begin(), next_it; it != this->cache.end(); it = next_it) { @@ -59,21 +59,21 @@ class MySQLLiveModule : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->SQL = service_reference<SQLProvider>("SQLProvider", engine); } - void OnShutdown() + void OnShutdown() anope_override { Implementation i[] = { I_OnFindChan, I_OnFindNick, I_OnFindCore }; for (size_t j = 0; j < 3; ++j) ModuleManager::Detach(i[j], this); } - void OnFindChan(const Anope::string &chname) + void OnFindChan(const Anope::string &chname) anope_override { if (chan_cache.Check(chname)) return; @@ -107,7 +107,7 @@ class MySQLLiveModule : public Module } } - void OnFindNick(const Anope::string &nick) + void OnFindNick(const Anope::string &nick) anope_override { if (nick_cache.Check(nick)) return; @@ -141,7 +141,7 @@ class MySQLLiveModule : public Module } } - void OnFindCore(const Anope::string &nick) + void OnFindCore(const Anope::string &nick) anope_override { if (core_cache.Check(nick)) return; diff --git a/modules/database/db_sql_live_write.cpp b/modules/database/db_sql_live_write.cpp index dad5318de..9ac2e17a1 100644 --- a/modules/database/db_sql_live_write.cpp +++ b/modules/database/db_sql_live_write.cpp @@ -7,12 +7,12 @@ class MySQLInterface : public SQLInterface public: MySQLInterface(Module *o) : SQLInterface(o) { } - void OnResult(const SQLResult &r) + void OnResult(const SQLResult &r) anope_override { Log(LOG_DEBUG) << "SQL successfully executed query: " << r.finished_query; } - void OnError(const SQLResult &r) + void OnError(const SQLResult &r) anope_override { if (!r.GetQuery().query.empty()) Log(LOG_DEBUG) << "Error executing query " << r.finished_query << ": " << r.GetError(); @@ -120,14 +120,14 @@ class DBMySQL : public Module OnServerConnect(); } - void OnReload() + void OnReload() anope_override { ConfigReader config; Anope::string engine = config.ReadValue("db_sql", "engine", "", 0); this->SQL = service_reference<SQLProvider>("SQLProvider", engine); } - void OnServerConnect() + void OnServerConnect() anope_override { Implementation i[] = { /* Misc */ @@ -156,7 +156,7 @@ class DBMySQL : public Module ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); } - void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> ¶ms) + void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> ¶ms) anope_override { User *u = source.u; @@ -217,32 +217,32 @@ class DBMySQL : public Module } } - void OnNickAddAccess(NickCore *nc, const Anope::string &entry) + void OnNickAddAccess(NickCore *nc, const Anope::string &entry) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickEraseAccess(NickCore *nc, const Anope::string &entry) + void OnNickEraseAccess(NickCore *nc, const Anope::string &entry) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickClearAccess(NickCore *nc) + void OnNickClearAccess(NickCore *nc) anope_override { this->Insert(nc->serialize_name(), nc->serialize()); } - void OnDelCore(NickCore *nc) + void OnDelCore(NickCore *nc) anope_override { this->Delete(nc->serialize_name(), nc->serialize()); } - void OnNickForbidden(NickAlias *na) + void OnNickForbidden(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnNickGroup(User *u, NickAlias *) + void OnNickGroup(User *u, NickAlias *) anope_override { OnNickRegister(findnick(u->nick)); } @@ -257,13 +257,13 @@ class DBMySQL : public Module this->Insert(nc->serialize_name(), nc->serialize()); } - void OnNickRegister(NickAlias *na) + void OnNickRegister(NickAlias *na) anope_override { this->InsertCore(na->nc); this->InsertAlias(na); } - void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) + void OnChangeCoreDisplay(NickCore *nc, const Anope::string &newdisplay) anope_override { Serializable::serialized_data data = nc->serialize(); this->Delete(nc->serialize_name(), data); @@ -283,154 +283,154 @@ class DBMySQL : public Module } } - void OnNickSuspend(NickAlias *na) + void OnNickSuspend(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnDelNick(NickAlias *na) + void OnDelNick(NickAlias *na) anope_override { this->Delete(na->serialize_name(), na->serialize()); } - void OnAccessAdd(ChannelInfo *ci, User *, ChanAccess *access) + void OnAccessAdd(ChannelInfo *ci, User *, ChanAccess *access) anope_override { this->Insert(access->serialize_name(), access->serialize()); } - void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) + void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) anope_override { this->Delete(access->serialize_name(), access->serialize()); } - void OnAccessClear(ChannelInfo *ci, User *u) + void OnAccessClear(ChannelInfo *ci, User *u) anope_override { for (unsigned i = 0; i < ci->GetAccessCount(); ++i) this->OnAccessDel(ci, NULL, ci->GetAccess(i)); } - void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) + void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnDelChan(ChannelInfo *ci) + void OnDelChan(ChannelInfo *ci) anope_override { this->Delete(ci->serialize_name(), ci->serialize()); } - void OnChanRegistered(ChannelInfo *ci) + void OnChanRegistered(ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnChanSuspend(ChannelInfo *ci) + void OnChanSuspend(ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); } - void OnAkickAdd(ChannelInfo *ci, AutoKick *ak) + void OnAkickAdd(User *u, ChannelInfo *ci, AutoKick *ak) anope_override { this->Insert(ak->serialize_name(), ak->serialize()); } - void OnAkickDel(ChannelInfo *ci, AutoKick *ak) + void OnAkickDel(User *u, ChannelInfo *ci, AutoKick *ak) anope_override { this->Delete(ak->serialize_name(), ak->serialize()); } - EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) + EventReturn OnMLock(ChannelInfo *ci, ModeLock *lock) anope_override { this->Insert(lock->serialize_name(), lock->serialize()); return EVENT_CONTINUE; } - EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) + EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) anope_override { this->Delete(lock->serialize_name(), lock->serialize()); return EVENT_CONTINUE; } - void OnBotCreate(BotInfo *bi) + void OnBotCreate(BotInfo *bi) anope_override { this->Insert(bi->serialize_name(), bi->serialize()); } - void OnBotChange(BotInfo *bi) + void OnBotChange(BotInfo *bi) anope_override { OnBotCreate(bi); } - void OnBotDelete(BotInfo *bi) + void OnBotDelete(BotInfo *bi) anope_override { this->Delete(bi->serialize_name(), bi->serialize()); } - EventReturn OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) + EventReturn OnBotAssign(User *sender, ChannelInfo *ci, BotInfo *bi) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); return EVENT_CONTINUE; } - EventReturn OnBotUnAssign(User *sender, ChannelInfo *ci) + EventReturn OnBotUnAssign(User *sender, ChannelInfo *ci) anope_override { this->Insert(ci->serialize_name(), ci->serialize()); return EVENT_CONTINUE; } - void OnBadWordAdd(ChannelInfo *ci, BadWord *bw) + void OnBadWordAdd(ChannelInfo *ci, BadWord *bw) anope_override { this->Insert(bw->serialize_name(), bw->serialize()); } - void OnBadWordDel(ChannelInfo *ci, BadWord *bw) + void OnBadWordDel(ChannelInfo *ci, BadWord *bw) anope_override { this->Delete(bw->serialize_name(), bw->serialize()); } - void OnMemoSend(const Anope::string &source, const Anope::string &target, MemoInfo *mi, Memo *m) + void OnMemoSend(const Anope::string &source, const Anope::string &target, MemoInfo *mi, Memo *m) anope_override { this->Insert(m->serialize_name(), m->serialize()); } - void OnMemoDel(const NickCore *nc, MemoInfo *mi, Memo *m) + void OnMemoDel(const NickCore *nc, MemoInfo *mi, Memo *m) anope_override { this->Delete(m->serialize_name(), m->serialize()); } - void OnMemoDel(ChannelInfo *ci, MemoInfo *mi, Memo *m) + void OnMemoDel(ChannelInfo *ci, MemoInfo *mi, Memo *m) anope_override { this->Delete(m->serialize_name(), m->serialize()); } - EventReturn OnExceptionAdd(Exception *ex) + EventReturn OnExceptionAdd(Exception *ex) anope_override { this->Insert(ex->serialize_name(), ex->serialize()); return EVENT_CONTINUE; } - void OnExceptionDel(User *, Exception *ex) + void OnExceptionDel(User *, Exception *ex) anope_override { this->Delete(ex->serialize_name(), ex->serialize()); } - EventReturn OnAddXLine(XLine *x, XLineManager *xlm) + EventReturn OnAddXLine(User *u, XLine *x, XLineManager *xlm) anope_override { this->Insert(x->serialize_name(), x->serialize()); return EVENT_CONTINUE; } - void OnDelXLine(User *, XLine *x, XLineManager *xlm) + void OnDelXLine(User *, XLine *x, XLineManager *xlm) anope_override { this->Delete(x->serialize_name(), x->serialize()); } - void OnDeleteVhost(NickAlias *na) + void OnDeleteVhost(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } - void OnSetVhost(NickAlias *na) + void OnSetVhost(NickAlias *na) anope_override { this->Insert(na->serialize_name(), na->serialize()); } |