All of insp now builds with -pedantic (theres some warnings to squash in modules...

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

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index e25fd06bb8234ff497c9212784e048d44fc50bf4..b1aa8e19a25cc3b2c4187173ed9a33c0da91e316 100644 (file)
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -23,13 +23,17 @@
 /* $LinkerFlags: exec("pcre-config --libs") rpath("pcre-config --libs") -lpcre */
 /* $ModDep: m_filter.h */
 
+#ifdef WINDOWS
+#pragma comment(lib, "pcre.lib")
+#endif
+
 class PCREFilter : public FilterResult
 {
  public:
         pcre* regexp;
 
         PCREFilter(pcre* r, const std::string &rea, const std::string &act, long gline_time, const std::string &pat, const std::string &flags)
-                : FilterResult::FilterResult(pat, rea, act, gline_time, flags), regexp(r)
+                : FilterResult(pat, rea, act, gline_time, flags), regexp(r)
         {
         }
 
@@ -48,7 +52,7 @@ class ModuleFilterPCRE : public FilterBase
 
  public:
        ModuleFilterPCRE(InspIRCd* Me)
-       : FilterBase::FilterBase(Me, "m_filter_pcre.so")
+       : FilterBase(Me, "m_filter_pcre.so")
        {
                OnRehash(NULL,"");
        }
@@ -57,7 +61,7 @@ class ModuleFilterPCRE : public FilterBase
        {
        }
 
-       virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
+       virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags)
        {
                for (std::vector<PCREFilter>::iterator index = filters.begin(); index != filters.end(); index++)
                {
@@ -127,7 +131,7 @@ class ModuleFilterPCRE : public FilterBase
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {               
                ConfigReader MyConf(ServerInstance);
 
@@ -160,41 +164,19 @@ class ModuleFilterPCRE : public FilterBase
                }
        }
 
-       virtual int OnStats(char symbol, userrec* user, string_list &results)
+       virtual int OnStats(char symbol, User* user, string_list &results)
        {
                if (symbol == 's')
                {
                        std::string sn = ServerInstance->Config->ServerName;
                        for (std::vector<PCREFilter>::iterator i = filters.begin(); i != filters.end(); i++)
                        {
-                               results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
+                               results.push_back(sn+" 223 "+user->nick+" :REGEXP:"+i->freeform+" "+i->flags+" "+i->action+" "+ConvToStr(i->gline_time)+" :"+i->reason);
                        }
                }
                return 0;
        }
 };
-       
-
-class ModuleFilterPCREFactory : public ModuleFactory
-{
- public:
-       ModuleFilterPCREFactory()
-       {
-       }
-       
-       ~ModuleFilterPCREFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleFilterPCRE(Me);
-       }
-       
-};
 
+MODULE_INIT(ModuleFilterPCRE)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleFilterPCREFactory;
-}