3rd time lucky? Fix again for setsockopt.

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

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 8d7eaafc3b2cda9ab2c05f5401efe9d015891dfa..a3923205f9321771683372beb739d9282dc79759 100644 (file)
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -15,12 +15,11 @@
 #include "inspircd.h"
 
 /* $ModDesc: Regex module using plain wildcard matching. */
-/* $ModDep: m_regex.h */
 
 class GlobRegex : public Regex
 {
 public:
-       GlobRegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+       GlobRegex(const std::string& rx) : Regex(rx)
        {
        }
 
@@ -37,16 +36,13 @@ public:
 class ModuleRegexGlob : public Module
 {
 public:
-       ModuleRegexGlob(InspIRCd* Me) : Module(Me)
-       {
-               Me->Modules->PublishInterface("RegularExpression", this);
-               Implementation eventlist[] = { I_OnRequest };
-               Me->Modules->Attach(eventlist, this, 1);
+       ModuleRegexGlob()       {
+               ServerInstance->Modules->PublishInterface("RegularExpression", this);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Regex module using plain wildcard matching.", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+               return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR | VF_SERVICEPROVIDER);
        }
 
        virtual ~ModuleRegexGlob()
@@ -54,20 +50,18 @@ public:
                ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
        }
 
-       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 "glob";
+                       static_cast<RegexNameRequest&>(request).result = "glob";
                }
-               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 = (Regex*)new GlobRegex(rx, ServerInstance);
-                       return "OK";
+                       RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
+                       std::string rx = rfr.GetRegex();
+                       rfr.result = new GlobRegex(rx);
                }
-               return NULL;
        }
 };