Improved strhashcomp with no allocations

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 6f612f6b2dcb0cfb994a171a17e21ad45adf0ddf..de782cf1922db5e419a81e2e4efb4d26cce81152 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -25,102 +25,61 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
-class ModuleBlockColor : public Module
+class ModuleBlockColour : public Module
 {
        Server *Srv;
  public:
  
-       ModuleBlockColor(Server* Me)
-               : Module::Module(Me)
+       ModuleBlockColour(Server* Me) : Module::Module(Me)
        {
                Srv = Me;
                Srv->AddExtendedMode('c',MT_CHANNEL,false,0,0);
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                // we don't really have a limit...
-               std::stringstream line(output);
-               std::string temp1, temp2;
-               while (!line.eof())
-               {
-                       line >> temp1;
-                       if (temp1.substr(0,10) == "CHANMODES=")
-                       {
-                               // append the chanmode to the end
-                               temp1 = temp1.substr(10,temp1.length());
-                               temp1 = "CHANMODES=" + temp1 + "c";
-                       }
-                       temp2 = temp2 + temp1 + " ";
-               }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
-       
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       void Implements(char* List)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       char *ctptr = ctext;
-                       snprintf(ctext,MAXBUF,"%s",text.c_str());
-
-
-                       if (c->IsCustomModeSet('c'))
-                       {
-                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-                               while (ctptr && *ctptr)
-                               {
-                                       switch (*ctptr)
-                                       {
-                                               case 2:
-                                               case 3:
-                                               case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
-                                                       return 1;
-                                                       break;
-                                       }
+               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnExtendedMode] = 1;
+       }
 
-                                       *ctptr++;
-                               }
-                       }
-               }
-               return 0;
+       virtual void On005Numeric(std::string &output)
+       {
+               InsertMode(output,"c",4);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
-                       char ctext[MAXBUF];
-                       char *ctptr = ctext;
-                       snprintf(ctext,MAXBUF,"%s",text.c_str());
-
-
-                       if (c->IsCustomModeSet('c'))
+                       
+                       if(c->IsCustomModeSet('c'))
                        {
-                               /* Instead of using strchr() here, do our own loop. Hopefully faster. --w00t */
-                               while (ctptr && *ctptr)
+                               /* Replace a strlcpy(), which ran even when +c wasn't set, with this (no copies at all) -- Om */
+                               for(unsigned int i = 0; i < text.length(); i++)
                                {
-                                       switch (*ctptr)
+                                       switch (text[i])
                                        {
                                                case 2:
                                                case 3:
+                                               case 15:
+                                               case 21:
+                                               case 22:
                                                case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colors to channel (+c set)",user->nick, c->name);
+                                                       WriteServ(user->fd,"404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
                                                        return 1;
-                                                       break;
+                                               break;
                                        }
-
-                                       *ctptr++;
                                }
                        }
                }
                return 0;
        }
        
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+       {
+               return OnUserPreMessage(user,dest,target_type,text,status);
+       }
+       
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
        {
                // check if this is our mode character...
@@ -135,7 +94,7 @@ class ModuleBlockColor : public Module
                }
        }
 
-       virtual ~ModuleBlockColor()
+       virtual ~ModuleBlockColour()
        {
        }
        
@@ -146,20 +105,20 @@ class ModuleBlockColor : public Module
 };
 
 
-class ModuleBlockColorFactory : public ModuleFactory
+class ModuleBlockColourFactory : public ModuleFactory
 {
  public:
-       ModuleBlockColorFactory()
+       ModuleBlockColourFactory()
        {
        }
        
-       ~ModuleBlockColorFactory()
+       ~ModuleBlockColourFactory()
        {
        }
        
        virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleBlockColor(Me);
+               return new ModuleBlockColour(Me);
        }
        
 };
@@ -167,6 +126,5 @@ class ModuleBlockColorFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-       return new ModuleBlockColorFactory;
+       return new ModuleBlockColourFactory;
 }
-