From 22658d63bdb1e52a66f4514af45fa55ca5891345 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 26 May 2013 17:13:11 -0400 Subject: Get rid of the remaining references in the core to specific services. Move more stuff out of the core to the proper modules. --- modules/database/db_flatfile.cpp | 8 ++------ modules/database/db_old.cpp | 2 -- modules/database/db_plain.cpp | 8 ++------ 3 files changed, 4 insertions(+), 14 deletions(-) (limited to 'modules/database') diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp index 19f263e98..27b6ce1a2 100644 --- a/modules/database/db_flatfile.cpp +++ b/modules/database/db_flatfile.cpp @@ -8,8 +8,6 @@ * Based on the original code of Services by Andy Church. */ -/*************************************************************************/ - #include "module.h" class SaveData : public Serialize::Data @@ -240,7 +238,7 @@ class DBFlatFile : public Module, public Pipe } - EventReturn OnSaveDatabase() anope_override + void OnSaveDatabase() anope_override { BackupDatabase(); @@ -250,7 +248,7 @@ class DBFlatFile : public Module, public Pipe { i = fork(); if (i > 0) - return EVENT_CONTINUE; + return; else if (i < 0) Log(this) << "Unable to fork for database save"; } @@ -335,8 +333,6 @@ class DBFlatFile : public Module, public Pipe this->Notify(); exit(0); } - - return EVENT_CONTINUE; } /* Load just one type. Done if a module is reloaded during runtime */ diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 64faafe10..b901d879a 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -8,8 +8,6 @@ * Based on the original code of Services by Andy Church. */ -/*************************************************************************/ - #include "module.h" #include "modules/os_session.h" diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp index fe95e06bb..a2c8d4274 100644 --- a/modules/database/db_plain.cpp +++ b/modules/database/db_plain.cpp @@ -8,8 +8,6 @@ * Based on the original code of Services by Andy Church. */ -/*************************************************************************/ - #include "module.h" #include "modules/os_session.h" @@ -654,7 +652,7 @@ class DBPlain : public Module } - EventReturn OnSaveDatabase() anope_override + void OnSaveDatabase() anope_override { BackupDatabase(); @@ -868,15 +866,13 @@ class DBPlain : public Module if (!db.is_open()) { IRCD->SendGlobops(NULL, "Unable to open %s for writing!", DatabaseFile.c_str()); - return EVENT_CONTINUE; + return; } db << db_buffer.str(); db_buffer.str(""); db.close(); - - return EVENT_CONTINUE; } }; -- cgit