Fix test client error cheecking on result types

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 77f882d0e16d96315a6ef2c24e93c72be57e5729..41248832df0244bc19227bf4492a6b8b5fbcf0bd 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -31,7 +31,7 @@ class cmd_swhois : public command_t
                this->source = "m_swhois.so";
        }
 
-       void Handle(char** parameters, int pcnt, userrec* user)
+       void Handle(const char** parameters, int pcnt, userrec* user)
        {
                userrec* dest = Srv->FindNick(std::string(parameters[0]));
                if(dest)
@@ -45,7 +45,8 @@ class cmd_swhois : public command_t
                                line.append(parameters[i]);
                        }
                        
-                       std::string* text = (std::string*)dest->GetExt("swhois");
+                       std::string* text;
+                       dest->GetExt("swhois", text);
        
                        if(text)
                        {
@@ -56,7 +57,7 @@ class cmd_swhois : public command_t
                                        WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                                
                                dest->Shrink("swhois");
-                               delete text;
+                               DELETE(text);
                        }
                        else if(!Srv->IsUlined(user->server))
                        {
@@ -65,7 +66,7 @@ class cmd_swhois : public command_t
                        }
                        
                        text = new std::string(line);
-                       dest->Extend("swhois", (char*)text);
+                       dest->Extend("swhois", text);
                }
        }
 };
@@ -85,9 +86,9 @@ class ModuleSWhois : public Module
                Srv->AddCommand(mycommand);
        }
 
-       void OnRehash(std::string parameter)
+       void OnRehash(const std::string &parameter)
        {
-               delete Conf;
+               DELETE(Conf);
                Conf = new ConfigReader();
        }
 
@@ -99,10 +100,10 @@ class ModuleSWhois : public Module
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
        virtual void OnWhois(userrec* source, userrec* dest)
        {
-               char* desc = dest->GetExt("swhois");
-               if (desc)
+               std::string* swhois;
+               dest->GetExt("swhois", swhois);
+               if (swhois)
                {
-                       std::string* swhois = (std::string*)desc;
                        WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
                }
        }
@@ -112,17 +113,16 @@ class ModuleSWhois : public Module
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, std::string extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
        {
                // check if the linking module wants to know about OUR metadata
                if (extname == "swhois")
                {
                        // check if this user has an swhois field to send
-                       char* field = user->GetExt("swhois");
-                       if (field)
+                       std::string* swhois;
+                       user->GetExt("swhois", swhois);
+                       if (swhois)
                        {
-                               // get our extdata out with a cast
-                               std::string* swhois = (std::string*)field;
                                // call this function in the linking module, let it format the data how it
                                // sees fit, and send it on its way. We dont need or want to know how.
                                proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois);
@@ -131,14 +131,14 @@ class ModuleSWhois : public Module
        }
 
        // when a user quits, tidy up their metadata
-       virtual void OnUserQuit(userrec* user, std::string message)
+       virtual void OnUserQuit(userrec* user, const std::string &message)
        {
-               char* field = user->GetExt("swhois");
-               if (field)
+               std::string* swhois;
+               user->GetExt("swhois", swhois);
+               if (swhois)
                {
-                       std::string* swhois = (std::string*)field;
                        user->Shrink("swhois");
-                       delete swhois;
+                       DELETE(swhois);
                }
        }
 
@@ -148,12 +148,12 @@ class ModuleSWhois : public Module
                if (target_type == TYPE_USER)
                {
                        userrec* user = (userrec*)item;
-                       char* field = user->GetExt("swhois");
-                       if (field)
+                       std::string* swhois;
+                       user->GetExt("swhois", swhois);
+                       if (swhois)
                        {
-                               std::string* swhois = (std::string*)field;
                                user->Shrink("swhois");
-                               delete swhois;
+                               DELETE(swhois);
                        }
                }
        }
@@ -165,22 +165,23 @@ class ModuleSWhois : public Module
        // In our case we're only sending a single string around, so we just construct a std::string.
        // Some modules will probably get much more complex and format more detailed structs and classes
        // in a textual way for sending over the link.
-       virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata)
+       virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
        {
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "swhois"))
                {
                        userrec* dest = (userrec*)target;
                        // if they dont already have an swhois field, accept the remote server's
-                       if (!dest->GetExt("swhois"))
+                       std::string* text;
+                       if (!dest->GetExt("swhois", text))
                        {
                                std::string* text = new std::string(extdata);
-                               dest->Extend("swhois",(char*)text);
+                               dest->Extend("swhois",text);
                        }
                }
        }
        
-       virtual void OnOper(userrec* user, std::string opertype)
+       virtual void OnOper(userrec* user, const std::string &opertype)
        {
                for(int i =0; i < Conf->Enumerate("type"); i++)
                {
@@ -192,14 +193,15 @@ class ModuleSWhois : public Module
                                
                                if(swhois.length())
                                {
-                                       if(std::string* old = (std::string*)user->GetExt("swhois"))
+                                       std::string* old;
+                                       if(user->GetExt("swhois", old))
                                        {
                                                user->Shrink("swhois");
-                                               delete old;
+                                               DELETE(old);
                                        }
                        
                                        std::string* text = new std::string(swhois);
-                                       user->Extend("swhois", (char*)text);
+                                       user->Extend("swhois", text);
                                        
                                        break;
                                }
@@ -209,7 +211,7 @@ class ModuleSWhois : public Module
        
        virtual ~ModuleSWhois()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()