X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_posix.cpp;h=b5fddfab8f2c0e748aa35cb22fcc861bc2eeb90f;hb=f3513de58a69cd396d1c108bb39bc0233e96049e;hp=ab9fe68ff3ec0fee5b51e6f17ed7029372baefc2;hpb=b7e793d96131e7813fe42984ec3a04254720ad20;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index ab9fe68ff..b5fddfab8 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -23,15 +23,6 @@
 #include <sys/types.h>
 #include <regex.h>
 
-class POSIXRegexException : public ModuleException
-{
- public:
-	POSIXRegexException(const std::string& rx, const std::string& error)
-		: ModuleException("Error in regex " + rx + ": " + error)
-	{
-	}
-};
-
 class POSIXRegex : public Regex
 {
 	regex_t regbuf;
@@ -54,7 +45,7 @@ class POSIXRegex : public Regex
 			error = errbuf;
 			delete[] errbuf;
 			regfree(&regbuf);
-			throw POSIXRegexException(rx, error);
+			throw RegexException(rx, error);
 		}
 	}
 
@@ -63,14 +54,9 @@ class POSIXRegex : public Regex
 		regfree(&regbuf);
 	}
 
-	bool Matches(const std::string& text)
+	bool Matches(const std::string& text) CXX11_OVERRIDE
 	{
-		if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-		{
-			// Bang. :D
-			return true;
-		}
-		return false;
+		return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
 	}
 };
 
@@ -79,7 +65,7 @@ class PosixFactory : public RegexFactory
  public:
 	bool extended;
 	PosixFactory(Module* m) : RegexFactory(m, "regex/posix") {}
-	Regex* Create(const std::string& expr)
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
 		return new POSIXRegex(expr, extended);
 	}
@@ -92,8 +78,6 @@ class ModuleRegexPOSIX : public Module
  public:
 	ModuleRegexPOSIX() : ref(this)
 	{
-		ServerInstance->Modules->AddService(ref);
-		OnRehash(NULL);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
@@ -101,7 +85,7 @@ class ModuleRegexPOSIX : public Module
 		return Version("Regex Provider Module for POSIX Regular Expressions", VF_VENDOR);
 	}
 
-	void OnRehash(User* u) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ref.extended = ServerInstance->Config->ConfValue("posix")->getBool("extended");
 	}