From 7c1352df0c8bb2624d4f2cc8320467578c39a6ad Mon Sep 17 00:00:00 2001 From: danieldg Date: Sat, 26 Sep 2009 17:28:25 +0000 Subject: Compile fixes and message updates git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11767 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/extra/m_regex_pcre.cpp | 4 ++-- src/modules/extra/m_regex_posix.cpp | 4 ++-- src/modules/extra/m_regex_tre.cpp | 4 ++-- src/modules/extra/m_ssl_gnutls.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/modules/extra') diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp index 4389ad685..782847736 100644 --- a/src/modules/extra/m_regex_pcre.cpp +++ b/src/modules/extra/m_regex_pcre.cpp @@ -39,7 +39,7 @@ private: pcre* regex; public: - PCRERegex(const std::string& rx, ) : Regex(rx, Me) + PCRERegex(const std::string& rx) : Regex(rx) { const char* error; int erroffset; @@ -96,7 +96,7 @@ public: { RegexFactoryRequest* rfr = (RegexFactoryRequest*)request; std::string rx = rfr->GetRegex(); - rfr->result = new PCRERegex(rx, ServerInstance); + rfr->result = new PCRERegex(rx); return "OK"; } return NULL; diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp index 5fe4db29f..7afaad076 100644 --- 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, bool extended) : Regex(rx, Me) + POSIXRegex(const std::string& rx, bool extended) : Regex(rx) { int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB; int errcode; @@ -109,7 +109,7 @@ public: { RegexFactoryRequest* rfr = (RegexFactoryRequest*)request; std::string rx = rfr->GetRegex(); - rfr->result = new POSIXRegex(rx, ServerInstance, extended); + rfr->result = new POSIXRegex(rx, extended); return "OK"; } return NULL; diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp index 1ed35605b..41aaec31c 100644 --- a/src/modules/extra/m_regex_tre.cpp +++ b/src/modules/extra/m_regex_tre.cpp @@ -36,7 +36,7 @@ private: regex_t regbuf; public: - TRERegex(const std::string& rx, ) : Regex(rx, Me) + TRERegex(const std::string& rx) : Regex(rx) { int flags = REG_EXTENDED | REG_NOSUB; int errcode; @@ -102,7 +102,7 @@ public: { RegexFactoryRequest* rfr = (RegexFactoryRequest*)request; std::string rx = rfr->GetRegex(); - rfr->result = new TRERegex(rx, ServerInstance); + rfr->result = new TRERegex(rx); return "OK"; } return NULL; diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 1fe84649f..813ae9e9b 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -261,7 +261,7 @@ class ModuleSSLGnuTLS : public Module if((ret = gnutls_certificate_set_x509_crl_file (x509_cred, crlfile.c_str(), GNUTLS_X509_FMT_PEM)) < 0) ServerInstance->Logs->Log("m_ssl_gnutls",DEBUG, "m_ssl_gnutls.so: Failed to set X.509 CRL file '%s': %s", crlfile.c_str(), gnutls_strerror(ret)); - FileReader reader(ServerInstance); + FileReader reader; reader.LoadFile(certfile); std::string cert_string = reader.Contents(); -- cgit v1.2.3