Update Event and Request APIs

[user/henk/code/inspircd.git] / src / modules / extra / m_regex_posix.cpp

diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 34a7e9babdccee00a537131e3d848ea07da95770..62b44e0e4dae4497c53b1ee9fce605d88b976d65 100644 (file)
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -34,7 +34,7 @@ private:
        regex_t regbuf;
 
 public:
-       POSIXRegex(const std::string& rx, InspIRCd* Me, bool extended) : Regex(rx, Me)
+       POSIXRegex(const std::string& rx, bool extended) : Regex(rx)
        {
                int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB;
                int errcode;
@@ -76,11 +76,10 @@ class ModuleRegexPOSIX : public Module
 private:
        bool extended;
 public:
-       ModuleRegexPOSIX(InspIRCd* Me) : Module(Me)
-       {
-               Me->Modules->PublishInterface("RegularExpression", this);
-               Implementation eventlist[] = { I_OnRequest, I_OnRehash };
-               Me->Modules->Attach(eventlist, this, 2);
+       ModuleRegexPOSIX()      {
+               ServerInstance->Modules->PublishInterface("RegularExpression", this);
+               Implementation eventlist[] = { I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
                OnRehash(NULL);
        }
 
@@ -96,24 +95,22 @@ public:
 
        virtual void OnRehash(User* u)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                extended = Conf.ReadFlag("posix", "extended", 0);
        }
 
-       virtual const char* OnRequest(Request* request)
+       void OnRequest(Request& request)
        {
-               if (strcmp("REGEX-NAME", request->GetId()) == 0)
+               if (strcmp("REGEX-NAME", request.id) == 0)
                {
-                       return "posix";
+                       static_cast<RegexNameRequest&>(request).result = "posix";
                }
-               else if (strcmp("REGEX", request->GetId()) == 0)
+               else if (strcmp("REGEX", request.id) == 0)
                {
-                       RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-                       std::string rx = rfr->GetRegex();
-                       rfr->result = new POSIXRegex(rx, ServerInstance, extended);
-                       return "OK";
+                       RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
+                       std::string rx = rfr.GetRegex();
+                       rfr.result = new POSIXRegex(rx, extended);
                }
-               return NULL;
        }
 };